Mercurial > hg > xemacs-beta
diff configure @ 151:59463afc5666 r20-3b2
Import from CVS: tag r20-3b2
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:37:19 +0200 |
| parents | 538048ae2ab8 |
| children | 25f70ba0133c |
line wrap: on
line diff
--- a/configure Mon Aug 13 09:36:20 2007 +0200 +++ b/configure Mon Aug 13 09:37:19 2007 +0200 @@ -176,12 +176,12 @@ ac_ext=c -xe_cppflags='$c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine $c_switch_x_system' -xe_ldflags='$ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system' +xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' +xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run' xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard' ac_cpp='$CPP '"$xe_cppflags" -ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' +ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cross_compiling=no if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then @@ -202,7 +202,7 @@ cache_file=/dev/null -MAKE_SUBDIR="src lib-src" +MAKE_SUBDIR="$MAKE_SUBDIR lib-src" && if test "$extra_verbose" = "yes"; then echo " Appending \"lib-src\" to \$MAKE_SUBDIR"; fi prefix='/usr/local' exec_prefix='${prefix}' @@ -234,13 +234,14 @@ use_system_malloc='default' energize_version='' native_sound_lib='' -error_check_default='no' +error_check_default='yes' error_check_extents=$error_check_default error_check_typecheck=$error_check_default error_check_bufpos=$error_check_default error_check_gc=$error_check_default error_check_malloc=$error_check_default debug=$error_check_default +extra_verbose=$error_check_default use_assertions='yes' with_gif='' with_toolbars='' @@ -373,7 +374,7 @@ --with-dnet (*) Compile with support for DECnet. --mail-locking=TYPE (*) Specify the locking to be used by movemail to prevent concurrent updates of mail spool files. Valid types - are \`lockf', \`flock', and \`lock-file'. + are \`lockf', \`flock', and \`file'. Internationalization options: @@ -383,10 +384,10 @@ --with-xim=motif (*) Used in conjunction with Mule support. Use either raw Xlib to provide XIM support, or the Motif XmIm* routines (when available). - If the XmIm* routines are autodetected, - then the default is --with-xim=motif, else --with-xim=no. - NOTE: On some systems like SunOS4 use of this option - will cause XEmacs to crash at startup. + NOTE: On some systems bugs in X11's XIM support + will cause XEmacs to crash, so by default, + no XIM support is compiled in, unless running + on Solaris and the XmIm* routines are detected. --with-canna (*) Compile with support for Canna (a Japanese input method used in conjunction with Mule support). --with-wnn (*) Compile with support for WNN (a multi-language input method @@ -587,7 +588,7 @@ with_database_gnudbm=no for x in `echo "$val" | sed 's/,/ /'` ; do case "$x" in - no ) : ;; + no ) ;; b | be | ber | berk | berkd | berkdb ) with_database_berkdb=yes ;; d | db | dbm ) with_database_dbm=yes ;; g | gn | gnu | gnud | gnudb | gnudbm ) with_database_gnudbm=yes ;; @@ -599,7 +600,7 @@ esac done if test "$with_database_dbm" = "yes" -a \ - "$with_database_gnudbm" = "yes" ; then + "$with_database_gnudbm" = "yes"; then (echo "$progname: Usage error:" echo " " "Only one of \`dbm' and \`gnudbm' may be specified with the \`--$optname' option." @@ -640,7 +641,7 @@ case "$val" in lockf ) val=lockf ;; flock ) val=flock ;; - file ) val=file ;; + file ) val=file ;; * ) (echo "$progname: Usage error:" echo " " "The \`--$optname' option must have one of these values: \`lockf', \`flock', or \`file'." @@ -684,7 +685,7 @@ echo " " "Valid types for the \`--$optname' option are: $types." echo " Use \`$progname --help' to show usage.") >&2 && exit 1 - elif test "$new_default" ; then + elif test -n "$new_default" ; then error_check_extents=$new_default error_check_typecheck=$new_default error_check_bufpos=$new_default @@ -700,8 +701,8 @@ prefix | exec_prefix | bindir | datadir | statedir | libdir | \ mandir | infodir | lispdir | etcdir | lockdir | archlibdir | \ sitelispdir | docdir ) - if test "$valomitted" = "yes" ; then - if test "$#" = 0 ; then + if test "$valomitted" = "yes"; then + if test "$#" = 0; then (echo "$progname: Usage error:" echo " " "The \`--$optname' option requires a value." echo " Use \`$progname --help' to show usage.") >&2 && exit 1; @@ -769,34 +770,15 @@ if test "$with_energize" = "yes" ; then with_menubars=lucid with_scrollbars=motif with_dialogs=motif with_tooltalk=yes - MAKE_SUBDIR="$MAKE_SUBDIR lwlib/energize" + MAKE_SUBDIR="$MAKE_SUBDIR lwlib/energize" && if test "$extra_verbose" = "yes"; then echo " Appending \"lwlib/energize\" to \$MAKE_SUBDIR"; fi fi test "$extra_verbose" = "yes" && verbose=yes -test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias -if test "$with_workshop" = "yes"; then - { test "$extra_verbose" = "yes" && cat << \EOF - Defining SUNPRO -EOF -cat >> confdefs.h <<\EOF -#define SUNPRO 1 -EOF -} - - extra_objs="$extra_objs sunpro.o" - with_tooltalk=yes -fi - case "site_includes" in *:* ) site_includes="`echo $site_includes | sed 's/:/ /g'`";; esac case "site_libraries" in *:* ) site_libraries="`echo $site_libraries | sed 's/:/ /g'`";; esac case "site_runtime_libraries" in *:* ) site_runtime_libraries="`echo $site_runtime_libraries | sed 's/:/ /g'`";; esac -if test "$debug" = "yes"; then - use_assertions=yes memory_usage_stats=yes - extra_objs="$extra_objs debug.o" -fi - test -n "$with_x" && with_x11="$with_x" if test "$run_in_place" = "yes"; then @@ -853,7 +835,7 @@ esac echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:857: checking whether ln -s works" >&5 +echo "configure:839: checking whether ln -s works" >&5 rm -f conftestdata if ln -s X conftestdata 2>/dev/null @@ -908,16 +890,9 @@ vpath %.in $(srcdir)' fi -for dir in ./src ./lib-src ./dynodump ./lwlib ./lock ; do - test ! -d "$dir" && mkdir "$dir" -done -if test "$with_energize" = "yes" -a ! -d ./lwlib/energize; then - mkdir ./lwlib/energize -fi - echo "checking "the configuration name"" 1>&6 -echo "configure:921: checking "the configuration name"" >&5 +echo "configure:896: checking "the configuration name"" >&5 internal_configuration=`echo $configuration | sed 's/-\(energize\|workshop\)//'` if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else exit $? @@ -927,7 +902,7 @@ -machine='' opsys='' need_dynodump=no +machine='' opsys='' case "$canonical" in sparc-*-* ) machine=sparc ;; @@ -982,10 +957,9 @@ *-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;; *-*-sysv4.[2-9]* | *-sysvr4.[2-9]* ) if test -z "$NON_GNU_CPP" ; then - if test -f /usr/ccs/lib/cpp - then NON_GNU_CPP=/usr/ccs/lib/cpp - else NON_GNU_CPP=/lib/cpp - fi + for prog in "/usr/ccs/lib/cpp" "/lib/cpp"; do + if test -f "$prog"; then NON_GNU_CPP="$prog"; break; fi + done fi opsys=usg5-4-2 ;; *-sysv4* | *-sysvr4* ) opsys=usg5-4 ;; @@ -1083,18 +1057,12 @@ *-hp-hpux8* ) opsys=hpux8 ;; *-hp-hpux9* ) opsys=hpux9 ;; *-hp-hpux10* ) opsys=hpux10 ;; - * ) - case "`uname -r`" in - *.B8.* ) opsys=hpux8 ;; - *.08.* ) opsys=hpux8 ;; - *.09.* ) opsys=hpux9 ;; - *.10.* ) opsys=hpux10 ;; - * ) opsys=hpux ;; - esac - ;; + * ) opsys=hpux ;; esac - case "$opsys" in hpux9 | hpux10 ) extra_objs="$extra_objs strcat.o";; esac + case "$opsys" in hpux9 | hpux10 ) extra_objs="$extra_objs strcat.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"strcat.o\"" + fi ;; esac if test "$opsys" = "hpux10"; then ansi_flag="-Ae"; else ansi_flag="-Aa"; fi NON_GNU_CC="cc $ansi_flag" NON_GNU_CPP="cc $ansi_flag -E" @@ -1205,8 +1173,7 @@ *-solaris2* ) test -f /usr/ccs/lib/cpp && NON_GNU_CPP=/usr/ccs/lib/cpp RANLIB=':' - case "$canonical" in *-solaris2.[0-5]* ) need_dynodump=yes ;; esac - esac + esac case "$canonical" in i[3-9]86-*-sunos4*) opsys=sunos4-0 ;; @@ -1318,6 +1285,29 @@ opsysfile="s/${opsys}.h" +if test "$debug" = "yes"; then + use_assertions=yes memory_usage_stats=yes + extra_objs="$extra_objs debug.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"debug.o\"" + fi +fi + +test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias +if test "$with_workshop" = "yes"; then + { test "$extra_verbose" = "yes" && cat << \EOF + Defining SUNPRO +EOF +cat >> confdefs.h <<\EOF +#define SUNPRO 1 +EOF +} + + extra_objs="$extra_objs sunpro.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"sunpro.o\"" + fi + with_tooltalk=yes +fi + test -n "$CC" && cc_specified=yes SPECIFIED_CFLAGS="$CFLAGS" @@ -1328,7 +1318,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1332: checking for $ac_word" >&5 +echo "configure:1322: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1354,7 +1344,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1358: checking for $ac_word" >&5 +echo "configure:1348: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1399,23 +1389,23 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1403: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1393: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c -xe_cppflags='$c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine $c_switch_x_system' -xe_ldflags='$ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system' +xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' +xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run' xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard' ac_cpp='$CPP '"$xe_cppflags" -ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' +ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1415 "configure" +#line 1405 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1435,19 +1425,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1439: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1429: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1444: checking whether we are using GNU C" >&5 +echo "configure:1434: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1461,7 +1451,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1465: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1455: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1486,12 +1476,12 @@ fi -if test "$with_gcc" = "no" -a "$ac_cv_prog_gcc" = "yes"; then +if test "$with_gcc" = "no" -a "$ac_cv_prog_gcc" = "yes"; then CC=${NON_GNU_CC-cc} # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1495: checking for $ac_word" >&5 +echo "configure:1485: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1517,7 +1507,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1521: checking for $ac_word" >&5 +echo "configure:1511: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1562,23 +1552,23 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1566: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1556: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c -xe_cppflags='$c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine $c_switch_x_system' -xe_ldflags='$ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system' +xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' +xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run' xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard' ac_cpp='$CPP '"$xe_cppflags" -ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' +ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1578 "configure" +#line 1568 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1598,19 +1588,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1602: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1592: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1607: checking whether we are using GNU C" >&5 +echo "configure:1597: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1624,7 +1614,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1628: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1618: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1648,12 +1638,12 @@ test "${CFLAGS+set}" = set || CFLAGS="-g" fi -elif test "$with_gcc" = "yes" -a "$ac_cv_prog_gcc" = "no" ; then +elif test "$with_gcc" = "yes" -a "$ac_cv_prog_gcc" = "no" ; then CC=gcc # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1657: checking for $ac_word" >&5 +echo "configure:1647: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1679,7 +1669,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1683: checking for $ac_word" >&5 +echo "configure:1673: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1724,23 +1714,23 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1718: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c -xe_cppflags='$c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine $c_switch_x_system' -xe_ldflags='$ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system' +xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' +xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run' xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard' ac_cpp='$CPP '"$xe_cppflags" -ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' +ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1740 "configure" +#line 1730 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1760,19 +1750,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1754: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1769: checking whether we are using GNU C" >&5 +echo "configure:1759: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1786,7 +1776,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1790: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1780: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1816,7 +1806,7 @@ test -n "$NON_GNU_CPP" -a "$with_gcc" = "no" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1820: checking how to run the C preprocessor" >&5 +echo "configure:1810: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1829,13 +1819,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1833 "configure" +#line 1823 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1846,13 +1836,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1850 "configure" +#line 1840 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1875,7 +1865,7 @@ case "$canonical" in - *-sun-sunos* ) test "$CPP" = "acc -E" && CPP="acc -E -Xs" ;; + *-sun-sunos* ) test "$CPP" = "acc -E" && CPP="acc -E -Xs" ;; esac @@ -1901,47 +1891,47 @@ #include "'$srcdir'/src/'$machfile'" #ifndef LIBS_MACHINE -#define LIBS_MACHINE +#define LIBS_MACHINE #endif configure___ libs_machine=LIBS_MACHINE #ifndef LIBS_SYSTEM -#define LIBS_SYSTEM +#define LIBS_SYSTEM #endif configure___ libs_system=LIBS_SYSTEM #ifndef LIBS_TERMCAP -#define LIBS_TERMCAP +#define LIBS_TERMCAP #endif configure___ libs_termcap=LIBS_TERMCAP #ifndef LIB_STANDARD -#define LIB_STANDARD +#define LIB_STANDARD #endif configure___ libs_standard=LIB_STANDARD #ifndef C_SWITCH_SYSTEM -#define C_SWITCH_SYSTEM +#define C_SWITCH_SYSTEM #endif configure___ c_switch_system=C_SWITCH_SYSTEM #ifndef C_SWITCH_MACHINE -#define C_SWITCH_MACHINE +#define C_SWITCH_MACHINE #endif configure___ c_switch_machine=C_SWITCH_MACHINE #ifndef C_SWITCH_X_SYSTEM -#define C_SWITCH_X_SYSTEM +#define C_SWITCH_X_SYSTEM #endif configure___ c_switch_x_system=C_SWITCH_X_SYSTEM #ifndef LD_SWITCH_X_SYSTEM -#define LD_SWITCH_X_SYSTEM +#define LD_SWITCH_X_SYSTEM #endif configure___ ld_switch_x_system=LD_SWITCH_X_SYSTEM #ifndef LD_SWITCH_SYSTEM -#define LD_SWITCH_SYSTEM +#define LD_SWITCH_SYSTEM #endif configure___ ld_switch_system=LD_SWITCH_SYSTEM @@ -1985,12 +1975,6 @@ configure___ mail_use_lockf=no #endif -#ifdef __SUNPRO_C -configure___ sunpro_c=yes -#else -configure___ sunpro_c=no -#endif - #ifdef THIS_IS_CONFIGURE @@ -2025,11 +2009,107 @@ fi rm $tempcname -if test "$cflags" != "NO_CFLAGS_DEFINED" ; then - REAL_CFLAGS=$cflags -fi - -UNEXEC_SRC="`echo $unexec | sed 's/\.o/.c/'`" +test "$cflags" != "NO_CFLAGS_DEFINED" && REAL_CFLAGS="$cflags" + +extra_objs="$extra_objs $unexec" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"$unexec\"" + fi + + +if test -n "$site_libraries"; then + for arg in $site_libraries; do + case "$arg" in -* ) ;; * ) arg="-L${arg}" ;; esac + ld_switch_site="$ld_switch_site $arg" && if test "$extra_verbose" = "yes"; then echo " Appending \"$arg\" to \$ld_switch_site"; fi + done +fi + +if test -n "$site_includes" ; then + for arg in $site_includes; do + case "$arg" in -* ) ;; * ) arg="-I${arg}" ;; esac + c_switch_site="$c_switch_site $arg" && if test "$extra_verbose" = "yes"; then echo " Appending \"$arg\" to \$c_switch_site"; fi + done +fi + +for dir in "/usr/ccs/lib"; do + test -d "$dir" && ld_switch_site="$ld_switch_site -L${dir}" && if test "$extra_verbose" = "yes"; then echo " Appending \"-L${dir}\" to \$ld_switch_site"; fi +done + +if test -n "$site_runtime_libraries" ; then + LD_RUN_PATH="`echo $site_runtime_libraries | sed 's/ */:/'`" + export LD_RUN_PATH +fi + + +if test "$dynamic" = "no"; then add_runtime_path=no +elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes +else case "$canonical" in + *-solaris2.* | *-sgi-irix* ) add_runtime_path=yes ;; + * ) add_runtime_path=no ;; + esac +fi + +if test "$add_runtime_path" = "yes"; then + echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 +echo "configure:2054: checking "for runtime libraries flag"" >&5 + dash_r="" + for try_dash_r in "-R" "-R " "-rpath "; do + xe_check_libs="${try_dash_r}/no/such/file-or-directory" + cat > conftest.$ac_ext <<EOF +#line 2059 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:2066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + dash_r="$try_dash_r" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + xe_check_libs="" + test -n "$dash_r" && break + done + if test -n "$dash_r"; + then echo "$ac_t"""\"${dash_r}\""" 1>&6 + else echo "$ac_t""NONE" 1>&6 + fi +fi + + +if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then + ld_switch_site="`echo $ld_switch_site | sed \"s/${dash_r}[^ ]*//\"`" + ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`" + + if test -n "$LD_RUN_PATH"; then + runpath="$LD_RUN_PATH" + else + runpath="" + for arg in $ld_switch_site $ld_switch_x_site; do + case "$arg" in -L* ) + dir=`echo "$arg" | sed 's/^-L//'` + if test -n "`ls ${dir}/*.s[ol] 2>/dev/null`"; then + test -n "$runpath" && runpath="${runpath}:" + runpath="${runpath}${dir}" + fi + ;; + esac + done + case "$canonical" in *-solaris2.[1-4]* ) + test "$need_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;; + esac + fi + + if test -n "$runpath"; then + ld_switch_run="${dash_r}${runpath}" + test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath" + fi +fi + + GNU_MALLOC=yes if test "$system_malloc" = "yes" ; then @@ -2043,11 +2123,10 @@ fi - # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2051: checking for $ac_word" >&5 +echo "configure:2130: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -2100,7 +2179,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2104: checking for a BSD compatible install" >&5 +echo "configure:2183: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" @@ -2151,7 +2230,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2155: checking for $ac_word" >&5 +echo "configure:2234: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -2179,9 +2258,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2183: checking for AIX" >&5 -cat > conftest.$ac_ext <<EOF -#line 2185 "configure" +echo "configure:2262: checking for AIX" >&5 +cat > conftest.$ac_ext <<EOF +#line 2264 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -2211,15 +2290,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2215: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2218 "configure" +echo "configure:2294: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2297 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2252,15 +2331,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2256: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2259 "configure" +echo "configure:2335: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2338 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2293,15 +2372,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2297: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2300 "configure" +echo "configure:2376: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2379 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2331,10 +2410,10 @@ done echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2335: checking for ANSI C header files" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2338 "configure" +echo "configure:2414: checking for ANSI C header files" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2417 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2342,7 +2421,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2359,7 +2438,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2363 "configure" +#line 2442 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2377,7 +2456,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2381 "configure" +#line 2460 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2395,7 +2474,7 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. cat > conftest.$ac_ext <<EOF -#line 2399 "configure" +#line 2478 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2406,7 +2485,7 @@ exit (0); } EOF -if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then : else @@ -2431,10 +2510,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2435: checking whether time.h and sys/time.h may both be included" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2438 "configure" +echo "configure:2514: checking whether time.h and sys/time.h may both be included" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2517 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2443,7 +2522,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2467,10 +2546,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2471: checking for sys_siglist declaration in signal.h or unistd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2474 "configure" +echo "configure:2550: checking for sys_siglist declaration in signal.h or unistd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2553 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2482,7 +2561,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2507,9 +2586,9 @@ echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 -echo "configure:2511: checking for struct utimbuf" >&5 -cat > conftest.$ac_ext <<EOF -#line 2513 "configure" +echo "configure:2590: checking for struct utimbuf" >&5 +cat > conftest.$ac_ext <<EOF +#line 2592 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -2528,7 +2607,7 @@ static struct utimbuf x; x.actime = x.modtime; ; return 0; } EOF -if { (eval echo configure:2532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -2548,10 +2627,10 @@ rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2552: checking return type of signal handlers" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2555 "configure" +echo "configure:2631: checking return type of signal handlers" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2634 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2568,7 +2647,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2591,9 +2670,9 @@ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:2595: checking for struct timeval" >&5 -cat > conftest.$ac_ext <<EOF -#line 2597 "configure" +echo "configure:2674: checking for struct timeval" >&5 +cat > conftest.$ac_ext <<EOF +#line 2676 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -2609,7 +2688,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:2613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -2631,10 +2710,10 @@ rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2635: checking whether struct tm is in sys/time.h or time.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2638 "configure" +echo "configure:2714: checking whether struct tm is in sys/time.h or time.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2717 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -2642,7 +2721,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2666,10 +2745,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:2670: checking for tm_zone in struct tm" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2673 "configure" +echo "configure:2749: checking for tm_zone in struct tm" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2752 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -2677,7 +2756,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:2681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -2700,10 +2779,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:2704: checking for tzname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2707 "configure" +echo "configure:2783: checking for tzname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2786 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -2713,7 +2792,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -2739,10 +2818,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2743: checking for working const" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2746 "configure" +echo "configure:2822: checking for working const" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2825 "configure" #include "confdefs.h" int main() { @@ -2791,7 +2870,7 @@ ; return 0; } EOF -if { (eval echo configure:2795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2816,7 +2895,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2820: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2899: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -2841,12 +2920,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2845: checking whether byte ordering is bigendian" >&5 +echo "configure:2924: checking whether byte ordering is bigendian" >&5 ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 2850 "configure" +#line 2929 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2857,11 +2936,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:2861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 2865 "configure" +#line 2944 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2872,7 +2951,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:2876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2889,7 +2968,7 @@ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 2893 "configure" +#line 2972 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -2902,7 +2981,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:2906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_bigendian=no else @@ -2927,8 +3006,114 @@ fi +echo $ac_n "checking size of short""... $ac_c" 1>&6 +echo "configure:3011: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3014 "configure" +#include "confdefs.h" +#include <stdio.h> +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(short)); + exit(0); +} +EOF +if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +then + ac_cv_sizeof_short=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_short=0 +fi +rm -fr conftest* +echo "$ac_t""$ac_cv_sizeof_short" 1>&6 +{ test "$extra_verbose" = "yes" && cat << EOF + Defining SIZEOF_SHORT = $ac_cv_sizeof_short +EOF +cat >> confdefs.h <<EOF +#define SIZEOF_SHORT $ac_cv_sizeof_short +EOF +} + + +echo $ac_n "checking size of int""... $ac_c" 1>&6 +echo "configure:3046: checking size of int" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3049 "configure" +#include "confdefs.h" +#include <stdio.h> +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int)); + exit(0); +} +EOF +if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +then + ac_cv_sizeof_int=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int=0 +fi +rm -fr conftest* +echo "$ac_t""$ac_cv_sizeof_int" 1>&6 +{ test "$extra_verbose" = "yes" && cat << EOF + Defining SIZEOF_INT = $ac_cv_sizeof_int +EOF +cat >> confdefs.h <<EOF +#define SIZEOF_INT $ac_cv_sizeof_int +EOF +} + + +echo $ac_n "checking size of long""... $ac_c" 1>&6 +echo "configure:3081: checking size of long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3084 "configure" +#include "confdefs.h" +#include <stdio.h> +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long)); + exit(0); +} +EOF +if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +then + ac_cv_sizeof_long=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_long=0 +fi +rm -fr conftest* +echo "$ac_t""$ac_cv_sizeof_long" 1>&6 +{ test "$extra_verbose" = "yes" && cat << EOF + Defining SIZEOF_LONG = $ac_cv_sizeof_long +EOF +cat >> confdefs.h <<EOF +#define SIZEOF_LONG $ac_cv_sizeof_long +EOF +} + + + echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:2932: checking for long file names" >&5 +echo "configure:3117: checking for long file names" >&5 ac_cv_sys_long_file_names=yes # Test for long file names in all the places we know might matter: @@ -2976,12 +3161,12 @@ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:2980: checking for sqrt in -lm" >&5 +echo "configure:3165: checking for sqrt in -lm" >&5 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'` xe_check_libs=" -lm " cat > conftest.$ac_ext <<EOF -#line 2985 "configure" +#line 3170 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2992,7 +3177,7 @@ sqrt() ; return 0; } EOF -if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3004,7 +3189,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` @@ -3016,16 +3201,25 @@ EOF } - LIBS="-lm $LIBS" - -else - echo "$ac_t""no" 1>&6 -fi - + LIBS="-lm $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lm\" to \$LIBS"; fi + +else + echo "$ac_t""no" 1>&6 +fi + + + +{ test "$extra_verbose" = "yes" && cat << \EOF + Defining LISP_FLOAT_TYPE +EOF +cat >> confdefs.h <<\EOF +#define LISP_FLOAT_TYPE 1 +EOF +} echo "checking type of mail spool file locking" 1>&6 -echo "configure:3029: checking type of mail spool file locking" >&5 +echo "configure:3223: checking type of mail spool file locking" >&5 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf if test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF @@ -3046,7 +3240,173 @@ fi -if test "$need_dynodump" = "yes" ; then + +echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 +echo "configure:3246: checking for kstat_open in -lkstat" >&5 +ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lkstat " +cat > conftest.$ac_ext <<EOF +#line 3251 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char kstat_open(); + +int main() { +kstat_open() +; return 0; } +EOF +if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo kstat | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + { test "$extra_verbose" = "yes" && cat << EOF + Defining $ac_tr_lib +EOF +cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 +EOF +} + + LIBS="-lkstat $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lkstat\" to \$LIBS"; fi + +else + echo "$ac_t""no" 1>&6 +fi + + + + +echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 +echo "configure:3296: checking for kvm_read in -lkvm" >&5 +ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lkvm " +cat > conftest.$ac_ext <<EOF +#line 3301 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char kvm_read(); + +int main() { +kvm_read() +; return 0; } +EOF +if { (eval echo configure:3312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo kvm | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + { test "$extra_verbose" = "yes" && cat << EOF + Defining $ac_tr_lib +EOF +cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 +EOF +} + + LIBS="-lkvm $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lkvm\" to \$LIBS"; fi + +else + echo "$ac_t""no" 1>&6 +fi + + + + +echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 +echo "configure:3346: checking for cma_open in -lpthreads" >&5 +ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lpthreads " +cat > conftest.$ac_ext <<EOF +#line 3351 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char cma_open(); + +int main() { +cma_open() +; return 0; } +EOF +if { (eval echo configure:3362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo pthreads | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + { test "$extra_verbose" = "yes" && cat << EOF + Defining $ac_tr_lib +EOF +cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 +EOF +} + + LIBS="-lpthreads $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lpthreads\" to \$LIBS"; fi + +else + echo "$ac_t""no" 1>&6 +fi + + +if test "$ac_cv_lib_pthreads_cma_open" = "yes"; then + case "$opsys" in decosf*) c_switch_site="$c_switch_site -threads";; esac +fi + +echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 +echo "configure:3398: checking whether the -xildoff compiler flag is required" >&5 +if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then + if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; + then echo "$ac_t""no" 1>&6; + else echo "$ac_t""yes" 1>&6; ld_switch_site="$ld_switch_site -xildoff" && if test "$extra_verbose" = "yes"; then echo " Appending \"-xildoff\" to \$ld_switch_site"; fi + fi + else echo "$ac_t""no" 1>&6 +fi + +echo $ac_n "checking for dynodump""... $ac_c" 1>&6 +echo "configure:3408: checking for dynodump" >&5 +case "$canonical" in *-solaris2.[0-5]* ) + echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF Defining DYNODUMP EOF @@ -3055,22 +3415,19 @@ EOF } - MAKE_SUBDIR="$MAKE_SUBDIR dynodump" + MAKE_SUBDIR="$MAKE_SUBDIR dynodump" && if test "$extra_verbose" = "yes"; then echo " Appending \"dynodump\" to \$MAKE_SUBDIR"; fi case "$canonical" in sparc* ) dynodump_arch=sparc ;; powerpc* ) dynodump_arch=ppc ;; i*86* ) dynodump_arch=i386 ;; esac - test "$GCC" = "yes" && ld_switch_site="-fno-gnu-linker $ld_switch_site" -fi - -for dir in "/usr/ccs/lib"; do - test -d "$dir" && ld_switch_site="$ld_switch_site -L${dir}" -done + test "$GCC" = "yes" && ld_switch_site="$ld_switch_site -fno-gnu-linker" && if test "$extra_verbose" = "yes"; then echo " Appending \"-fno-gnu-linker\" to \$ld_switch_site"; fi ;; + *) echo "$ac_t""no" 1>&6 ;; +esac echo "checking "for specified window system"" 1>&6 -echo "configure:3074: checking "for specified window system"" >&5 +echo "configure:3431: checking "for specified window system"" >&5 if test "$x_includes $x_libraries" = "NONE NONE"; then if test -n "$OPENWINHOME" \ @@ -3091,7 +3448,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3095: checking for X" >&5 +echo "configure:3452: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3151,12 +3508,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 3155 "configure" +#line 3512 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3225,14 +3582,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 3229 "configure" +#line 3586 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:3236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -3341,17 +3698,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:3345: checking whether -R must be followed by a space" >&5 +echo "configure:3702: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 3348 "configure" +#line 3705 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -3367,14 +3724,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 3371 "configure" +#line 3728 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -3405,17 +3762,17 @@ # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). - if test "$with_dnet" = "no"; then + if test "$with_dnet" = "no" ; then ac_cv_lib_dnet_dnet_ntoa=no else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:3414: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3771: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet " cat > conftest.$ac_ext <<EOF -#line 3419 "configure" +#line 3776 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3426,7 +3783,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3438,7 +3795,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" else @@ -3450,12 +3807,12 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:3454: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3811: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet_stub " cat > conftest.$ac_ext <<EOF -#line 3459 "configure" +#line 3816 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3466,7 +3823,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3478,7 +3835,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" else @@ -3495,10 +3852,10 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3499: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3502 "configure" +echo "configure:3856: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3859 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -3521,7 +3878,7 @@ ; return 0; } EOF -if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3542,12 +3899,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3546: checking for gethostbyname in -lnsl" >&5 +echo "configure:3903: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <<EOF -#line 3551 "configure" +#line 3908 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3558,7 +3915,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3570,7 +3927,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" else @@ -3588,10 +3945,10 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3592: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3595 "configure" +echo "configure:3949: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3952 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -3614,7 +3971,7 @@ ; return 0; } EOF -if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3637,12 +3994,12 @@ xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:3641: checking "$xe_msg_checking"" >&5 +echo "configure:3998: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocket $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 3646 "configure" +#line 4003 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3653,7 +4010,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3665,7 +4022,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" else @@ -3677,10 +4034,10 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3681: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3684 "configure" +echo "configure:4038: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4041 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -3703,7 +4060,7 @@ ; return 0; } EOF -if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -3724,12 +4081,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3728: checking for remove in -lposix" >&5 +echo "configure:4085: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <<EOF -#line 3733 "configure" +#line 4090 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3740,7 +4097,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:3744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3752,7 +4109,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" else @@ -3764,10 +4121,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3768: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3771 "configure" +echo "configure:4125: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4128 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -3790,7 +4147,7 @@ ; return 0; } EOF -if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -3811,12 +4168,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3815: checking for shmat in -lipc" >&5 +echo "configure:4172: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <<EOF -#line 3820 "configure" +#line 4177 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3827,7 +4184,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3839,7 +4196,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" else @@ -3861,12 +4218,12 @@ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3865: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4222: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE " cat > conftest.$ac_ext <<EOF -#line 3870 "configure" +#line 4227 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3877,7 +4234,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3889,7 +4246,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" else @@ -3921,16 +4278,18 @@ EOF } - MAKE_SUBDIR="$MAKE_SUBDIR lwlib" + MAKE_SUBDIR="$MAKE_SUBDIR lwlib" && if test "$extra_verbose" = "yes"; then echo " Appending \"lwlib\" to \$MAKE_SUBDIR"; fi for lib_dir in "/usr/dt/lib" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do inc_dir="`echo $lib_dir | sed 's/lib/include/'`" if test -d "$lib_dir" -a -d "$inc_dir"; then - case "$x_libraries" in *"$lib_dir"* ) : ;; *) - x_libraries="$lib_dir $x_libraries" X_LIBS="-L${lib_dir} $X_LIBS" + case "$x_libraries" in *"$lib_dir"* ) ;; *) + x_libraries="$lib_dir $x_libraries" + X_LIBS="-L${lib_dir} $X_LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-L${lib_dir}\" to \$X_LIBS"; fi ;; esac - case "$x_includes" in "$inc_dir"* ) : ;; *) - x_includes="$inc_dir $x_includes" X_CFLAGS="-I${inc_dir} $X_CFLAGS" + case "$x_includes" in "$inc_dir"* ) ;; *) + x_includes="$inc_dir $x_includes" + X_CFLAGS="-I${inc_dir} $X_CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-I${inc_dir}\" to \$X_CFLAGS"; fi ;; esac break; fi done @@ -3938,17 +4297,50 @@ for rel in "X11R6" "X11R5" "X11R4"; do lib_dir="/usr/contrib/$rel/lib" inc_dir="/usr/contrib/$rel/include" if test -d "$lib_dir" -a -d "$inc_dir"; then - case "$x_libraries" in *"$lib_dir"* ) : ;; *) - x_libraries="$x_libraries $lib_dir" X_LIBS="$X_LIBS -L${lib_dir}" + case "$x_libraries" in *"$lib_dir"* ) ;; *) + x_libraries="$x_libraries $lib_dir" + X_LIBS="$X_LIBS -L${lib_dir}" && if test "$extra_verbose" = "yes"; then echo " Appending \"-L${lib_dir}\" to \$X_LIBS"; fi esac - case "$x_includes" in "$inc_dir"* ) : ;; *) - x_includes="$x_includes $inc_dir" X_CFLAGS="$X_CFLAGS -I${inc_dir}" + case "$x_includes" in "$inc_dir"* ) ;; *) + x_includes="$x_includes $inc_dir" + X_CFLAGS="$X_CFLAGS -I${inc_dir}" && if test "$extra_verbose" = "yes"; then echo " Appending \"-I${inc_dir}\" to \$X_CFLAGS"; fi esac break; fi done ld_switch_x_site="$X_LIBS" + +if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then + ld_switch_site="`echo $ld_switch_site | sed \"s/${dash_r}[^ ]*//\"`" + ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`" + + if test -n "$LD_RUN_PATH"; then + runpath="$LD_RUN_PATH" + else + runpath="" + for arg in $ld_switch_site $ld_switch_x_site; do + case "$arg" in -L* ) + dir=`echo "$arg" | sed 's/^-L//'` + if test -n "`ls ${dir}/*.s[ol] 2>/dev/null`"; then + test -n "$runpath" && runpath="${runpath}:" + runpath="${runpath}${dir}" + fi + ;; + esac + done + case "$canonical" in *-solaris2.[1-4]* ) + test "$need_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;; + esac + fi + + if test -n "$runpath"; then + ld_switch_run="${dash_r}${runpath}" + test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath" + fi +fi + + if test "$extra_verbose" = "yes"; then echo; echo "X11 compilation variables:" echo "x_libraries = $x_libraries" @@ -3962,15 +4354,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:3966: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3969 "configure" +echo "configure:4358: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4361 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3994,12 +4386,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:3998: checking for XOpenDisplay in -lX11" >&5 +echo "configure:4390: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 4003 "configure" +#line 4395 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4010,7 +4402,7 @@ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4022,7 +4414,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 have_lib_x11=yes else @@ -4035,12 +4427,12 @@ xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:4039: checking "$xe_msg_checking"" >&5 +echo "configure:4431: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 -b i486-linuxaout" cat > conftest.$ac_ext <<EOF -#line 4044 "configure" +#line 4436 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4051,7 +4443,7 @@ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4063,7 +4455,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site" else @@ -4074,18 +4466,19 @@ fi libs_x="-lX11" + test "$extra_verbose" = "yes" && echo " Setting libs_x to \"-lX11\"" case "$canonical" in *-sunos4.* ) # Bug workaround ld_switch_x_site="$ld_switch_x_site -u _XtToolkitInitialize" ;; esac echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:4084: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:4477: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <<EOF -#line 4089 "configure" +#line 4482 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4096,7 +4489,7 @@ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:4100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4108,9 +4501,9 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - libs_x="-lXt $libs_x" +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + libs_x="-lXt $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXt\" to \$libs_x"; fi else echo "$ac_t""no" 1>&6 { echo "configure: error: "Unable to find X11 libraries."" 1>&2; exit 1; } @@ -4119,29 +4512,29 @@ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:4123: checking the version of X11 being used" >&5 +echo "configure:4516: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 4125 "configure" +#line 4518 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:4130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then - ./conftest foobar; rc=$? + ./conftest foobar; x11_release=$? else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -fr conftest* - rc=4 + x11_release=4 fi rm -fr conftest* - echo "$ac_t""R${rc}" 1>&6 + echo "$ac_t""R${x11_release}" 1>&6 { test "$extra_verbose" = "yes" && cat << EOF - Defining THIS_IS_X11R${rc} + Defining THIS_IS_X11R${x11_release} EOF cat >> confdefs.h <<EOF -#define THIS_IS_X11R${rc} 1 +#define THIS_IS_X11R${x11_release} 1 EOF } @@ -4150,15 +4543,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4154: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4157 "configure" +echo "configure:4547: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4550 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4189,7 +4582,7 @@ echo $ac_n "checking for XFree86""... $ac_c" 1>&6 -echo "configure:4193: checking for XFree86" >&5 +echo "configure:4586: checking for XFree86" >&5 if test -d "/usr/X386/include" -o \ -f "/etc/XF86Config" -o \ -f "/etc/X11/XF86Config" -o \ @@ -4209,12 +4602,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:4213: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:4606: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <<EOF -#line 4218 "configure" +#line 4611 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4225,7 +4618,7 @@ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:4229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4237,9 +4630,9 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - libs_x="-lXext $libs_x" +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + libs_x="-lXext $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXext\" to \$libs_x"; fi else echo "$ac_t""no" 1>&6 fi @@ -4252,12 +4645,12 @@ if test -z "$with_xmu"; then echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6 -echo "configure:4256: checking for XmuConvertStandardSelection in -lXmu" >&5 +echo "configure:4649: checking for XmuConvertStandardSelection in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <<EOF -#line 4261 "configure" +#line 4654 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4268,49 +4661,7 @@ XmuConvertStandardSelection() ; return 0; } EOF -if { (eval echo configure:4272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -xe_check_libs="" - -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - with_xmu=yes -else - echo "$ac_t""no" 1>&6 -with_xmu=no -fi - - - fi - if test "$with_xmu" = "no"; then - extra_objs="$extra_objs xmu.o" - else - libs_x="-lXmu $libs_x" - fi - - -echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:4302: checking for main in -lXbsd" >&5 -ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` - -xe_check_libs=" -lXbsd " -cat > conftest.$ac_ext <<EOF -#line 4307 "configure" -#include "confdefs.h" - -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:4314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4322,59 +4673,39 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - libs_x="-lXbsd $libs_x" -else - echo "$ac_t""no" 1>&6 -fi - - - - ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:4337: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4340 "configure" -#include "confdefs.h" -#include <Xm/Xm.h> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - -echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:4362: checking for XmStringFree in -lXm" >&5 -ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` - -xe_check_libs=" -lXm " -cat > conftest.$ac_ext <<EOF -#line 4367 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XmStringFree(); +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + with_xmu=yes +else + echo "$ac_t""no" 1>&6 +with_xmu=no +fi + + + fi + if test "$with_xmu" = "no"; then + extra_objs="$extra_objs xmu.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"xmu.o\"" + fi + else + libs_x="-lXmu $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXmu\" to \$libs_x"; fi + fi + + +echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 +echo "configure:4697: checking for main in -lXbsd" >&5 +ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lXbsd " +cat > conftest.$ac_ext <<EOF +#line 4702 "configure" +#include "confdefs.h" int main() { -XmStringFree() +main() ; return 0; } EOF -if { (eval echo configure:4378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4386,29 +4717,23 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - have_motif=yes -else - echo "$ac_t""no" 1>&6 -have_motif=no -fi - - -else - echo "$ac_t""no" 1>&6 -have_motif=no -fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + libs_x="-lXbsd $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXbsd\" to \$libs_x"; fi +else + echo "$ac_t""no" 1>&6 +fi + echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6 -echo "configure:4407: checking for XawScrollbarSetThumb in -lXaw" >&5 +echo "configure:4732: checking for XawScrollbarSetThumb in -lXaw" >&5 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 4412 "configure" +#line 4737 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4419,7 +4744,7 @@ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4431,7 +4756,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 have_xaw=yes else @@ -4484,25 +4809,6 @@ esac fi -if test -n "$site_libraries"; then - for arg in $site_libraries; do - test -d "$arg" && arg="-L${arg}" - ld_switch_site="$ld_switch_site $arg" - done -fi - -if test -n "$site_runtime_libraries" ; then - LD_RUN_PATH="`echo $site_runtime_libraries | sed 's/ */:/'`" - export LD_RUN_PATH -fi - -if test -n "$site_includes" ; then - for arg in $site_includes; do - test -d "$arg" && arg="-I${arg}" - c_switch_site="$c_switch_site $arg" - done -fi - bitmapdir= @@ -4516,189 +4822,18 @@ test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h" esac -{ test "$extra_verbose" = "yes" && cat << \EOF - Defining LISP_FLOAT_TYPE -EOF -cat >> confdefs.h <<\EOF -#define LISP_FLOAT_TYPE 1 -EOF -} - - -echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:4530: checking for kstat_open in -lkstat" >&5 -ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` - -xe_check_libs=" -lkstat " -cat > conftest.$ac_ext <<EOF -#line 4535 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char kstat_open(); - -int main() { -kstat_open() -; return 0; } -EOF -if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -xe_check_libs="" - -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo kstat | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - { test "$extra_verbose" = "yes" && cat << EOF - Defining $ac_tr_lib -EOF -cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF -} - - LIBS="-lkstat $LIBS" - -else - echo "$ac_t""no" 1>&6 -fi - - - - -echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:4580: checking for kvm_read in -lkvm" >&5 -ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` - -xe_check_libs=" -lkvm " -cat > conftest.$ac_ext <<EOF -#line 4585 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char kvm_read(); - -int main() { -kvm_read() -; return 0; } -EOF -if { (eval echo configure:4596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -xe_check_libs="" - -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo kvm | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - { test "$extra_verbose" = "yes" && cat << EOF - Defining $ac_tr_lib -EOF -cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF -} - - LIBS="-lkvm $LIBS" - -else - echo "$ac_t""no" 1>&6 -fi - - - - -echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:4630: checking for cma_open in -lpthreads" >&5 -ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'` - -xe_check_libs=" -lpthreads " -cat > conftest.$ac_ext <<EOF -#line 4635 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char cma_open(); - -int main() { -cma_open() -; return 0; } -EOF -if { (eval echo configure:4646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -xe_check_libs="" - -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo pthreads | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - { test "$extra_verbose" = "yes" && cat << EOF - Defining $ac_tr_lib -EOF -cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF -} - - LIBS="-lpthreads $LIBS" - -else - echo "$ac_t""no" 1>&6 -fi - - -if test "$ac_cv_lib_pthreads_cma_open" = "yes"; then - case "$opsys" in decosf*) c_switch_site="$c_switch_site -threads";; esac -fi - -echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:4682: checking whether the -xildoff compiler flag is required" >&5 -if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then - if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; - then echo "$ac_t""no" 1>&6; - else echo "$ac_t""yes" 1>&6; ld_switch_site="$ld_switch_site -xildoff" - fi - else echo "$ac_t""no" 1>&6 -fi - test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:4694: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4697 "configure" +echo "configure:4829: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4832 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4721,12 +4856,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:4725: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:4860: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <<EOF -#line 4730 "configure" +#line 4865 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4737,7 +4872,7 @@ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:4741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4749,7 +4884,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 : else @@ -4768,20 +4903,20 @@ EOF } - libs_x="-lXau $libs_x" + libs_x="-lXau $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXau\" to \$libs_x"; fi fi test -z "$with_offix" && { ac_safe=`echo "OffiX/DragAndDrop.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for OffiX/DragAndDrop.h""... $ac_c" 1>&6 -echo "configure:4777: checking for OffiX/DragAndDrop.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4780 "configure" +echo "configure:4912: checking for OffiX/DragAndDrop.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4915 "configure" #include "confdefs.h" #include <OffiX/DragAndDrop.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4804,12 +4939,12 @@ } test -z "$with_offix" && { echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6 -echo "configure:4808: checking for DndInitialize in -lDnd" >&5 +echo "configure:4943: checking for DndInitialize in -lDnd" >&5 ac_lib_var=`echo Dnd'_'DndInitialize | sed 'y%./+-%__p_%'` xe_check_libs=" -lDnd " cat > conftest.$ac_ext <<EOF -#line 4813 "configure" +#line 4948 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4820,7 +4955,7 @@ DndInitialize() ; return 0; } EOF -if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4832,7 +4967,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 : else @@ -4851,7 +4986,7 @@ EOF } - libs_x="-lDnd $libs_x" + libs_x="-lDnd $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lDnd\" to \$libs_x"; fi fi test "$with_cde" = "yes" && with_tooltalk=yes # CDE requires tooltalk @@ -4859,15 +4994,15 @@ for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:4863: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4866 "configure" +echo "configure:4998: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5001 "configure" #include "confdefs.h" #include <${dir}tt_c.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4896,12 +5031,12 @@ xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:4900: checking "$xe_msg_checking"" >&5 +echo "configure:5035: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'` xe_check_libs=" -ltt $extra_libs" cat > conftest.$ac_ext <<EOF -#line 4905 "configure" +#line 5040 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4912,7 +5047,7 @@ tt_message_create() ; return 0; } EOF -if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4924,7 +5059,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 with_tooltalk=yes tt_libs="-ltt $extra_libs"; break else @@ -4953,21 +5088,23 @@ EOF } - libs_x="$tt_libs $libs_x" - extra_objs="$extra_objs tooltalk.o" + libs_x="$tt_libs $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$tt_libs\" to \$libs_x"; fi + extra_objs="$extra_objs tooltalk.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"tooltalk.o\"" + fi fi test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:4963: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4966 "configure" +echo "configure:5100: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5103 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4990,12 +5127,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:4994: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:5131: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <<EOF -#line 4999 "configure" +#line 5136 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5006,7 +5143,7 @@ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:5010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5018,7 +5155,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 : else @@ -5037,7 +5174,7 @@ EOF } - libs_x="-lDtSvc $libs_x" + libs_x="-lDtSvc $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lDtSvc\" to \$libs_x"; fi with_tooltalk=yes # CDE requires Tooltalk with_motif=yes # CDE requires Motif fi @@ -5053,19 +5190,19 @@ echo $ac_n "checking for main in -lenergize""... $ac_c" 1>&6 -echo "configure:5057: checking for main in -lenergize" >&5 +echo "configure:5194: checking for main in -lenergize" >&5 ac_lib_var=`echo energize'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lenergize " cat > conftest.$ac_ext <<EOF -#line 5062 "configure" +#line 5199 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5077,9 +5214,9 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lenergize" +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + LIBS="-lenergize $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lenergize\" to \$LIBS"; fi energize_version="3.X" { test "$extra_verbose" = "yes" && cat << \EOF Defining ENERGIZE_3 @@ -5097,19 +5234,19 @@ if test -z "$energize_version"; then echo $ac_n "checking for main in -lconn""... $ac_c" 1>&6 -echo "configure:5101: checking for main in -lconn" >&5 +echo "configure:5238: checking for main in -lconn" >&5 ac_lib_var=`echo conn'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lconn " cat > conftest.$ac_ext <<EOF -#line 5106 "configure" +#line 5243 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5121,9 +5258,9 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lconn" +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + LIBS="-lconn $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lconn\" to \$LIBS"; fi energize_version="2.X" { test "$extra_verbose" = "yes" && cat << \EOF Defining ENERGIZE_2 @@ -5139,18 +5276,18 @@ fi - fi + fi ac_safe=`echo "editorconn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for editorconn.h""... $ac_c" 1>&6 -echo "configure:5146: checking for editorconn.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5149 "configure" +echo "configure:5283: checking for editorconn.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5286 "configure" #include "confdefs.h" #include <editorconn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5192,7 +5329,7 @@ echo "checking for graphics libraries" 1>&6 -echo "configure:5196: checking for graphics libraries" >&5 +echo "configure:5333: checking for graphics libraries" >&5 test -z "$with_gif" && with_gif=yes; if test "$with_gif" = "yes"; then { test "$extra_verbose" = "yes" && cat << \EOF @@ -5203,20 +5340,22 @@ EOF } - extra_objs="$extra_objs dgif_lib.o gif_err.o gifalloc.o" + extra_objs="$extra_objs dgif_lib.o gif_err.o gifalloc.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"dgif_lib.o gif_err.o gifalloc.o\"" + fi fi test -z "$with_xpm" && { ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:5212: checking for X11/xpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5215 "configure" +echo "configure:5351: checking for X11/xpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5354 "configure" #include "confdefs.h" #include <X11/xpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5239,12 +5378,12 @@ } test -z "$with_xpm" && { echo $ac_n "checking for XpmReadFileToData in -lXpm""... $ac_c" 1>&6 -echo "configure:5243: checking for XpmReadFileToData in -lXpm" >&5 +echo "configure:5382: checking for XpmReadFileToData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmReadFileToData | sed 'y%./+-%__p_%'` xe_check_libs=" -lXpm " cat > conftest.$ac_ext <<EOF -#line 5248 "configure" +#line 5387 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5255,7 +5394,7 @@ XpmReadFileToData() ; return 0; } EOF -if { (eval echo configure:5259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5267,7 +5406,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 : else @@ -5286,20 +5425,20 @@ EOF } - libs_x="-lXpm $libs_x" + libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi fi test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:5295: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5298 "configure" +echo "configure:5434: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5437 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5322,12 +5461,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:5326: checking for UnGenFace in -lcompface" >&5 +echo "configure:5465: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 5331 "configure" +#line 5470 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5338,7 +5477,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:5342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5350,7 +5489,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 : else @@ -5369,20 +5508,20 @@ EOF } - libs_x="-lcompface $libs_x" + libs_x="-lcompface $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lcompface\" to \$libs_x"; fi fi test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:5378: checking for jpeglib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5381 "configure" +echo "configure:5517: checking for jpeglib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5520 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5405,12 +5544,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:5409: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:5548: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <<EOF -#line 5414 "configure" +#line 5553 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5421,7 +5560,7 @@ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:5425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5433,7 +5572,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 : else @@ -5452,20 +5591,20 @@ EOF } - libs_x="-ljpeg $libs_x" + libs_x="-ljpeg $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ljpeg\" to \$libs_x"; fi fi test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:5461: checking for png.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5464 "configure" +echo "configure:5600: checking for png.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5603 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5487,10 +5626,10 @@ fi } test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:5491: checking for pow" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5494 "configure" +echo "configure:5630: checking for pow" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5633 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ @@ -5513,7 +5652,7 @@ ; return 0; } EOF -if { (eval echo configure:5517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_pow=yes" else @@ -5538,12 +5677,12 @@ xe_msg_checking="for png_read_image in -lpng" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:5542: checking "$xe_msg_checking"" >&5 +echo "configure:5681: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng $extra_libs" cat > conftest.$ac_ext <<EOF -#line 5547 "configure" +#line 5686 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5554,7 +5693,7 @@ png_read_image() ; return 0; } EOF -if { (eval echo configure:5558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5566,7 +5705,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 png_libs="-lpng $extra_libs" with_png=yes; break else @@ -5587,7 +5726,7 @@ EOF } - libs_x="$png_libs $libs_x" + libs_x="$png_libs $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$png_libs\" to \$libs_x"; fi fi if test "$with_tiff" = "yes"; then @@ -5599,8 +5738,78 @@ EOF } - libs_x="-ltiff $libs_x" -fi + libs_x="-ltiff $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ltiff\" to \$libs_x"; fi +fi + + ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 +echo "configure:5747: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5750 "configure" +#include "confdefs.h" +#include <Xm/Xm.h> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:5755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + +echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 +echo "configure:5772: checking for XmStringFree in -lXm" >&5 +ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lXm " +cat > conftest.$ac_ext <<EOF +#line 5777 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XmStringFree(); + +int main() { +XmStringFree() +; return 0; } +EOF +if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + have_motif=yes +else + echo "$ac_t""no" 1>&6 +have_motif=no +fi + + +else + echo "$ac_t""no" 1>&6 +have_motif=no +fi + case "$with_menubars" in "" | "yes" | "athena" ) @@ -5627,7 +5836,7 @@ EOF } - libs_x="-lXaw $libs_x" ;; + libs_x="-lXaw $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXaw\" to \$libs_x"; fi ;; esac case "$all_widgets" in *motif* ) @@ -5750,24 +5959,46 @@ } -test "$with_menubars" != "no" && extra_objs="$extra_objs menubar.o" -test "$with_scrollbars" != "no" && extra_objs="$extra_objs scrollbar.o" -test "$with_dialogs" != "no" && extra_objs="$extra_objs dialog.o" -test "$with_toolbars" != "no" && extra_objs="$extra_objs toolbar.o" -test "$all_widgets" != "no no no no" && extra_objs="$extra_objs gui.o" +test "$with_menubars" != "no" && extra_objs="$extra_objs menubar.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"menubar.o\"" + fi +test "$with_scrollbars" != "no" && extra_objs="$extra_objs scrollbar.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"scrollbar.o\"" + fi +test "$with_dialogs" != "no" && extra_objs="$extra_objs dialog.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"dialog.o\"" + fi +test "$with_toolbars" != "no" && extra_objs="$extra_objs toolbar.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"toolbar.o\"" + fi +test "$all_widgets" != "no no no no" && extra_objs="$extra_objs gui.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"gui.o\"" + fi if test "$with_x11" = "yes"; then - test "$with_menubars" != "no" && extra_objs="$extra_objs menubar-x.o" - test "$with_scrollbars" != "no" && extra_objs="$extra_objs scrollbar-x.o" - test "$with_dialogs" != "no" && extra_objs="$extra_objs dialog-x.o" - test "$with_toolbars" != "no" && extra_objs="$extra_objs toolbar-x.o" - test "$all_widgets" != "no no no no" && extra_objs="$extra_objs gui-x.o" + test "$with_menubars" != "no" && extra_objs="$extra_objs menubar-x.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"menubar-x.o\"" + fi + test "$with_scrollbars" != "no" && extra_objs="$extra_objs scrollbar-x.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"scrollbar-x.o\"" + fi + test "$with_dialogs" != "no" && extra_objs="$extra_objs dialog-x.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"dialog-x.o\"" + fi + test "$with_toolbars" != "no" && extra_objs="$extra_objs toolbar-x.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"toolbar-x.o\"" + fi + test "$all_widgets" != "no no no no" && extra_objs="$extra_objs gui-x.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"gui-x.o\"" + fi fi test -z "$with_mule" && with_mule=no if test "$with_mule" = "yes" ; then + echo "checking for Mule-related features" 1>&6 +echo "configure:6002: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -5776,16 +6007,18 @@ EOF } - extra_objs="$extra_objs mule.o mule-ccl.o mule-charset.o mule-coding.o" + extra_objs="$extra_objs mule.o mule-ccl.o mule-charset.o mule-coding.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"mule.o mule-ccl.o mule-charset.o mule-coding.o\"" + fi echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:5784: checking for strerror in -lintl" >&5 +echo "configure:6017: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <<EOF -#line 5789 "configure" +#line 6022 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5796,7 +6029,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:5800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5808,7 +6041,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` @@ -5820,7 +6053,7 @@ EOF } - LIBS="-lintl $LIBS" + LIBS="-lintl $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lintl\" to \$LIBS"; fi else echo "$ac_t""no" 1>&6 @@ -5829,18 +6062,19 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:5833: checking for Mule input methods" >&5 - case "$with_xim" in "" | "yes" ) +echo "configure:6066: checking for Mule input methods" >&5 + test -z "$with_xim" && case "$opsys" in sol2* ) ;; *) with_xim=no ;; esac + case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:5836: checking for XIM" >&5 +echo "configure:6070: checking for XIM" >&5 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:5839: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:6073: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 5844 "configure" +#line 6078 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5851,7 +6085,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:5855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5863,7 +6097,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 with_xim=motif else @@ -5891,8 +6125,10 @@ EOF } - extra_objs="$extra_objs input-method-xlib.o" - fi + extra_objs="$extra_objs input-method-xlib.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"input-method-xlib.o\"" + fi + fi if test "$with_xim" = "motif"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining XIM_MOTIF @@ -5903,22 +6139,23 @@ } need_motif=yes - extra_objs="$extra_objs input-method-motif.o" - fi + extra_objs="$extra_objs input-method-motif.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"input-method-motif.o\"" + fi fi - + fi test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support - test -z "$with_wnn" && { ac_safe=`echo "wnn/wnnerror.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for wnn/wnnerror.h""... $ac_c" 1>&6 -echo "configure:5914: checking for wnn/wnnerror.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5917 "configure" -#include "confdefs.h" -#include <wnn/wnnerror.h> + test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 +echo "configure:6151: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6154 "configure" +#include "confdefs.h" +#include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5941,12 +6178,12 @@ } test -z "$with_wnn" && { echo $ac_n "checking for jl_dic_list in -lwnn""... $ac_c" 1>&6 -echo "configure:5945: checking for jl_dic_list in -lwnn" >&5 +echo "configure:6182: checking for jl_dic_list in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 5950 "configure" +#line 6187 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5957,7 +6194,7 @@ jl_dic_list() ; return 0; } EOF -if { (eval echo configure:5961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5969,7 +6206,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 : else @@ -5988,16 +6225,18 @@ EOF } - libs_x="-lwnn $libs_x" - extra_objs="$extra_objs mule-wnnfns.o" + libs_x="-lwnn $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lwnn\" to \$libs_x"; fi + extra_objs="$extra_objs mule-wnnfns.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"mule-wnnfns.o\"" + fi echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6 -echo "configure:5996: checking for jl_fi_dic_list in -lwnn" >&5 +echo "configure:6235: checking for jl_fi_dic_list in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 6001 "configure" +#line 6240 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6008,7 +6247,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:6012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6020,7 +6259,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 with_wnn6=yes else @@ -6029,26 +6268,26 @@ test "$with_wnn6" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF - Defining HAVE_WNN6 -EOF -cat >> confdefs.h <<\EOF -#define HAVE_WNN6 1 -EOF -} - - fi + Defining WNN6 +EOF +cat >> confdefs.h <<\EOF +#define WNN6 1 +EOF +} + + fi test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:6044: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6047 "configure" +echo "configure:6283: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6286 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6071,12 +6310,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:6075: checking for RkBgnBun in -lRKC" >&5 +echo "configure:6314: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <<EOF -#line 6080 "configure" +#line 6319 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6087,7 +6326,7 @@ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:6091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6099,7 +6338,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 : else @@ -6110,12 +6349,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:6114: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:6353: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <<EOF -#line 6119 "configure" +#line 6358 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6126,7 +6365,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6138,7 +6377,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 : else @@ -6157,28 +6396,60 @@ EOF } - libs_x="-lcanna -lRKC $libs_x" - extra_objs="$extra_objs mule-canna.o" - fi -else # "$with_mule" = "no" - for feature in xim canna wnn; do + libs_x="-lcanna -lRKC $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$libs_x"; fi + extra_objs="$extra_objs mule-canna.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"mule-canna.o\"" + fi + fi +else for feature in xim canna wnn; do if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then echo "configure: warning: "--with-${feature} ignored: Not valid without Mule support"" 1>&2 fi eval "with_${feature}=no" done -fi - - -test "$need_motif" = "yes" && libs_x="-lXm $libs_x" - -for ac_func in acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random realpath rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset utimes waitpid +fi + +if test "$need_motif" = "yes" ; then + libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi + +if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then + ld_switch_site="`echo $ld_switch_site | sed \"s/${dash_r}[^ ]*//\"`" + ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`" + + if test -n "$LD_RUN_PATH"; then + runpath="$LD_RUN_PATH" + else + runpath="" + for arg in $ld_switch_site $ld_switch_x_site; do + case "$arg" in -L* ) + dir=`echo "$arg" | sed 's/^-L//'` + if test -n "`ls ${dir}/*.s[ol] 2>/dev/null`"; then + test -n "$runpath" && runpath="${runpath}:" + runpath="${runpath}${dir}" + fi + ;; + esac + done + case "$canonical" in *-solaris2.[1-4]* ) + test "$need_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;; + esac + fi + + if test -n "$runpath"; then + ld_switch_run="${dash_r}${runpath}" + test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath" + fi +fi + +fi + +for ac_func in acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset utimes waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6179: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6182 "configure" +echo "configure:6450: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6453 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6201,7 +6472,7 @@ ; return 0; } EOF -if { (eval echo configure:6205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6229,19 +6500,88 @@ done -test "$ac_cv_func_realpath" = "yes" && extra_objs="$extra_objs realpath.o" + +case "$opsys" in + linux* | decosf4-0* | aix4* ) extra_objs="$extra_objs realpath.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"realpath.o\"" + fi ;; + * ) + for ac_func in realpath +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:6513: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6516 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:6539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + { test "$extra_verbose" = "yes" && cat << EOF + Defining $ac_tr_func +EOF +cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF +} + +else + echo "$ac_t""no" 1>&6 +fi +done + + test "$ac_cv_func_realpath" != "yes" && extra_objs="$extra_objs realpath.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"realpath.o\"" + fi ;; +esac + +test "$with_mocklisp" = "yes" && extra_objs="$extra_objs mocklisp.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"mocklisp.o\"" + fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:6236: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 6238 "configure" +echo "configure:6576: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 6578 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:6245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -6261,16 +6601,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:6265: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 6267 "configure" +echo "configure:6605: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 6607 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:6274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -6290,11 +6630,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:6294: checking whether localtime caches TZ" >&5 +echo "configure:6634: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 6298 "configure" +#line 6638 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -6329,7 +6669,7 @@ exit (0); } EOF -if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then emacs_cv_localtime_cache=no else @@ -6358,9 +6698,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6 -echo "configure:6362: checking whether gettimeofday cannot accept two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 6364 "configure" +echo "configure:6702: checking whether gettimeofday cannot accept two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 6704 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -6382,7 +6722,7 @@ ; return 0; } EOF -if { (eval echo configure:6386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -6404,19 +6744,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:6408: checking for inline" >&5 +echo "configure:6748: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 6413 "configure" +#line 6753 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:6420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -6461,17 +6801,17 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:6465: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6468 "configure" +echo "configure:6805: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6808 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -6495,10 +6835,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6499: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6502 "configure" +echo "configure:6839: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6842 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -6521,7 +6861,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:6525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -6560,10 +6900,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6564: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6567 "configure" +echo "configure:6904: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6907 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -6587,10 +6927,10 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6591: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6594 "configure" +echo "configure:6931: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6934 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6613,7 +6953,7 @@ ; return 0; } EOF -if { (eval echo configure:6617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6643,10 +6983,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6647: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6650 "configure" +echo "configure:6987: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6990 "configure" #include "confdefs.h" find_stack_direction () { @@ -6665,7 +7005,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:6669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_stack_direction=1 else @@ -6687,13 +7027,15 @@ fi -test -n "$ALLOCA" && extra_objs="$extra_objs $ALLOCA" +test -n "$ALLOCA" && extra_objs="$extra_objs $ALLOCA" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"$ALLOCA\"" + fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6694: checking for pid_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6697 "configure" +echo "configure:7036: checking for pid_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7039 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6725,15 +7067,15 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:6729: checking for vfork.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6732 "configure" +echo "configure:7071: checking for vfork.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7074 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6761,10 +7103,10 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:6765: checking for working vfork" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6768 "configure" +echo "configure:7107: checking for working vfork" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7110 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -6859,7 +7201,7 @@ } } EOF -if { (eval echo configure:6863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_vfork_works=yes else @@ -6884,10 +7226,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:6888: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6891 "configure" +echo "configure:7230: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7233 "configure" #include "confdefs.h" #include <string.h> main () @@ -6897,7 +7239,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:6901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -6921,125 +7263,19 @@ fi -echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:6926: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6929 "configure" -#include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(short)); - exit(0); -} -EOF -if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_short=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_short=0 -fi -rm -fr conftest* -echo "$ac_t""$ac_cv_sizeof_short" 1>&6 -{ test "$extra_verbose" = "yes" && cat << EOF - Defining SIZEOF_SHORT = $ac_cv_sizeof_short -EOF -cat >> confdefs.h <<EOF -#define SIZEOF_SHORT $ac_cv_sizeof_short -EOF -} - - -echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:6961: checking size of int" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6964 "configure" -#include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int)); - exit(0); -} -EOF -if { (eval echo configure:6975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int=0 -fi -rm -fr conftest* -echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -{ test "$extra_verbose" = "yes" && cat << EOF - Defining SIZEOF_INT = $ac_cv_sizeof_int -EOF -cat >> confdefs.h <<EOF -#define SIZEOF_INT $ac_cv_sizeof_int -EOF -} - - -echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:6996: checking size of long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6999 "configure" -#include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(long)); - exit(0); -} -EOF -if { (eval echo configure:7010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long=0 -fi -rm -fr conftest* -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -{ test "$extra_verbose" = "yes" && cat << EOF - Defining SIZEOF_LONG = $ac_cv_sizeof_long -EOF -cat >> confdefs.h <<EOF -#define SIZEOF_LONG $ac_cv_sizeof_long -EOF -} - - - for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7035: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7038 "configure" +echo "configure:7271: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7274 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7071,10 +7307,10 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7075: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7078 "configure" +echo "configure:7311: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7314 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7097,7 +7333,7 @@ ; return 0; } EOF -if { (eval echo configure:7101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7125,10 +7361,10 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:7129: checking for working mmap" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7132 "configure" +echo "configure:7365: checking for working mmap" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7368 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -7268,7 +7504,7 @@ } EOF -if { (eval echo configure:7272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_mmap_fixed_mapped=yes else @@ -7304,10 +7540,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:7308: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7311 "configure" +echo "configure:7544: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7547 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -7330,7 +7566,7 @@ ; return 0; } EOF -if { (eval echo configure:7334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -7345,15 +7581,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:7349: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7352 "configure" +echo "configure:7585: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7588 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7370,15 +7606,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:7374: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7377 "configure" +echo "configure:7610: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7613 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7403,9 +7639,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:7407: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:7643: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 7409 "configure" +#line 7645 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7416,7 +7652,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:7420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN @@ -7447,10 +7683,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:7451: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7454 "configure" +echo "configure:7687: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7690 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -7473,7 +7709,7 @@ ; return 0; } EOF -if { (eval echo configure:7477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -7488,15 +7724,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:7492: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7495 "configure" +echo "configure:7728: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7731 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7513,15 +7749,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:7517: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7520 "configure" +echo "configure:7753: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7756 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7559,15 +7795,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:7563: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7566 "configure" +echo "configure:7799: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7802 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7594,15 +7830,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:7598: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7601 "configure" +echo "configure:7834: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7837 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7635,15 +7871,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:7639: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7642 "configure" +echo "configure:7875: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7878 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7691,19 +7927,39 @@ exit 1 fi beta=`sed -ne 's/^.*XEmacs Lucid (beta\([0-9][0-9]*\)).*$/\1/p' "$file"` -test -n "$beta" && version="${version}-b${beta}" +test -n "$beta" && version="${version}-b${beta}" +{ test "$extra_verbose" = "yes" && cat << EOF + Defining EMACS_VERSION = $version +EOF +cat >> confdefs.h <<EOF +#define EMACS_VERSION $version +EOF +} + +main_1_id="`echo main_1_xemacs_${version}_${canonical} | sed 'y/.-/__/'`" +{ test "$extra_verbose" = "yes" && cat << EOF + Defining main_1 = $main_1_id +EOF +cat >> confdefs.h <<EOF +#define main_1 $main_1_id +EOF +} + echo "checking "for sound support"" 1>&6 -echo "configure:7700: checking "for sound support"" >&5 +echo "configure:7953: checking "for sound support"" >&5 case "$with_sound" in native | both ) with_native_sound=yes;; nas | no ) with_native_sound=no;; esac if test "$with_native_sound" != "no"; then if test -d "/usr/demo/SOUND"; then - sound_found="yes" extra_objs="$extra_objs sunplay.o" + sound_found="yes" + extra_objs="$extra_objs sunplay.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"sunplay.o\"" + fi if test -d "/usr/demo/SOUND/include" then sound_cflags="-I/usr/demo/SOUND/include" else sound_cflags="-I/usr/demo/SOUND" @@ -7719,12 +7975,12 @@ *-sgi-* ) echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:7723: checking for ALopenport in -laudio" >&5 +echo "configure:7979: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 7728 "configure" +#line 7984 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7735,7 +7991,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:7739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7747,7 +8003,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 native_sound_lib="-laudio" else @@ -7756,17 +8012,20 @@ if test "$native_sound_lib" = "-laudio"; then - sound_found="yes" extra_objs="$extra_objs sgiplay.o" sound_cflags="" + sound_found="yes" sound_cflags="" + extra_objs="$extra_objs sgiplay.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"sgiplay.o\"" + fi fi ;; hppa*-hp-hpux* ) echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:7765: checking for AOpenAudio in -lAlib" >&5 +echo "configure:8024: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <<EOF -#line 7770 "configure" +#line 8029 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7777,7 +8036,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:7781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7789,7 +8048,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 native_sound_lib="-lAlib" else @@ -7798,7 +8057,10 @@ if test "$native_sound_lib" = "-lAlib"; then - sound_found="yes" extra_objs="$extra_objs hpplay.o" + sound_found="yes" + extra_objs="$extra_objs hpplay.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"hpplay.o\"" + fi if test "$with_gcc" = "yes" # Kludge city then sound_cflags="-Dconst= -Dvolatile= -I/usr/audio/examples" else sound_cflags="+e -I/usr/audio/examples" @@ -7811,15 +8073,15 @@ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:7815: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7818 "configure" +echo "configure:8077: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8080 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7835,7 +8097,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 sound_found=yes - extra_objs="$extra_objs linuxplay.o" + extra_objs="$extra_objs linuxplay.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"linuxplay.o\"" + fi { test "$extra_verbose" = "yes" && cat << EOF Defining SOUNDCARD_H_PATH = "${dir}/soundcard.h" EOF @@ -7870,7 +8134,7 @@ EOF } - test -n "$native_sound_lib" && LIBS="$LIBS $native_sound_lib" + test -n "$native_sound_lib" && LIBS="$native_sound_lib $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$native_sound_lib\" to \$LIBS"; fi fi case "$with_sound" in both | nas ) @@ -7882,10 +8146,12 @@ EOF } - extra_objs="$extra_objs nas.o" - LIBS="$LIBS -laudio" + extra_objs="$extra_objs nas.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"nas.o\"" + fi + LIBS="-laudio $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$LIBS"; fi cat > conftest.$ac_ext <<EOF -#line 7889 "configure" +#line 8155 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -7908,14 +8174,11 @@ esac - - -echo "checking "how to do terminal I/O"" 1>&6 -echo "configure:7915: checking "how to do terminal I/O"" >&5 - test -z "$with_tty" && with_tty=yes if test "$with_tty" = "yes" ; then + echo "checking for TTY-related features" 1>&6 +echo "configure:8182: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -7924,18 +8187,21 @@ EOF } + extra_objs="$extra_objs console-tty.o device-tty.o event-tty.o frame-tty.o objects-tty.o redisplay-tty.o cm.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"console-tty.o device-tty.o event-tty.o frame-tty.o objects-tty.o redisplay-tty.o cm.o\"" + fi ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:7931: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7934 "configure" +echo "configure:8197: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8200 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7962,15 +8228,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:7966: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7969 "configure" +echo "configure:8232: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8235 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8005,15 +8271,15 @@ test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:8009: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8012 "configure" +echo "configure:8275: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8278 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8036,12 +8302,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for connect_to_gpm in -lgpm""... $ac_c" 1>&6 -echo "configure:8040: checking for connect_to_gpm in -lgpm" >&5 +echo "configure:8306: checking for connect_to_gpm in -lgpm" >&5 ac_lib_var=`echo gpm'_'connect_to_gpm | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <<EOF -#line 8045 "configure" +#line 8311 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8052,7 +8318,7 @@ connect_to_gpm() ; return 0; } EOF -if { (eval echo configure:8056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8064,7 +8330,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 with_gpm=yes else @@ -8082,30 +8348,32 @@ EOF } - extra_objs="$extra_objs gpmevent.o" - LIBS="$LIBS -lgpm" + extra_objs="$extra_objs gpmevent.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"gpmevent.o\"" + fi + LIBS="-lgpm $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lgpm\" to \$LIBS"; fi fi if test -z "$with_ncurses"; then -echo $ac_n "checking for tparm in -lncurses""... $ac_c" 1>&6 -echo "configure:8093: checking for tparm in -lncurses" >&5 -ac_lib_var=`echo ncurses'_'tparm | sed 'y%./+-%__p_%'` +echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 +echo "configure:8361: checking for tgetent in -lncurses" >&5 +ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <<EOF -#line 8098 "configure" +#line 8366 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tparm(); +char tgetent(); int main() { -tparm() +tgetent() ; return 0; } EOF -if { (eval echo configure:8109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8117,7 +8385,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 with_ncurses=yes else @@ -8138,15 +8406,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:8142: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8145 "configure" +echo "configure:8410: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8413 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8168,15 +8436,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:8172: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8175 "configure" +echo "configure:8440: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8443 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8196,23 +8464,25 @@ echo "$ac_t""no" 1>&6 fi - extra_objs="$extra_objs terminfo.o" - LIBS="$LIBS -lncurses" + extra_objs="$extra_objs terminfo.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"terminfo.o\"" + fi + LIBS="-lncurses $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lncurses\" to \$LIBS"; fi if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then save_c_switch_site="$c_switch_site" c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:8208: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8211 "configure" +echo "configure:8478: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8481 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8237,25 +8507,33 @@ else c_switch_site="$save_c_switch_site" fi fi - else -echo $ac_n "checking for tgoto in -ltermlib""... $ac_c" 1>&6 -echo "configure:8243: checking for tgoto in -ltermlib" >&5 -ac_lib_var=`echo termlib'_'tgoto | sed 'y%./+-%__p_%'` - -xe_check_libs=" -ltermlib " -cat > conftest.$ac_ext <<EOF -#line 8248 "configure" + else if test "$have_terminfo" = "yes"; then + extra_objs="$extra_objs terminfo.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"terminfo.o\"" + fi + if test -n "$libs_termcap"; then + LIBS="$libs_termcap $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi + else + for lib in curses termlib termcap; do + +echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 +echo "configure:8521: checking for tgetent in -l$lib" >&5 +ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` + +xe_check_libs=" -l$lib " +cat > conftest.$ac_ext <<EOF +#line 8526 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto(); +char tgetent(); int main() { -tgoto() +tgetent() ; return 0; } EOF -if { (eval echo configure:8259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8267,34 +8545,42 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - have_libtermlib=yes -else - echo "$ac_t""no" 1>&6 -have_libtermlib=no -fi - - - -echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:8282: checking for tgoto in -ltermcap" >&5 -ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` - -xe_check_libs=" -ltermcap " -cat > conftest.$ac_ext <<EOF -#line 8287 "configure" +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + LIBS="-l${lib} $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-l${lib}\" to \$LIBS"; fi; break +else + echo "$ac_t""no" 1>&6 +fi + + + done + fi + else extra_objs="$extra_objs tparam.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"tparam.o\"" + fi + case "$opsys" in *-hp-hpux* ) libs_termcap="-ltermcap" ;; esac + if test -n "$libs_termcap"; then + LIBS="$libs_termcap $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi + else + +echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 +echo "configure:8568: checking for tgetent in -lcurses" >&5 +ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lcurses " +cat > conftest.$ac_ext <<EOF +#line 8573 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto(); +char tgetent(); int main() { -tgoto() +tgetent() ; return 0; } EOF -if { (eval echo configure:8298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8306,34 +8592,30 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - have_libtermcap=yes -else - echo "$ac_t""no" 1>&6 -have_libtermcap=no -fi - - - -echo $ac_n "checking for tparm in -lcurses""... $ac_c" 1>&6 -echo "configure:8321: checking for tparm in -lcurses" >&5 -ac_lib_var=`echo curses'_'tparm | sed 'y%./+-%__p_%'` - -xe_check_libs=" -lcurses " -cat > conftest.$ac_ext <<EOF -#line 8326 "configure" +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + LIBS="-lcurses $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lcurses\" to \$LIBS"; fi +else + echo "$ac_t""no" 1>&6 + +echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 +echo "configure:8603: checking for tgetent in -ltermcap" >&5 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` + +xe_check_libs=" -ltermcap " +cat > conftest.$ac_ext <<EOF +#line 8608 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tparm(); +char tgetent(); int main() { -tparm() +tgetent() ; return 0; } EOF -if { (eval echo configure:8337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8345,28 +8627,20 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - have_libcurses=yes -else - echo "$ac_t""no" 1>&6 -have_libcurses=no -fi - - - - if test "$have_terminfo" = "yes"; then - extra_objs="$extra_objs terminfo.o" - if test -n "$libs_termcap"; then LIBS="$LIBS $libs_termcap" - elif test "$have_libcurses" = "yes"; then LIBS="$LIBS -lcurses" - elif test "$have_libtermlib" = "yes"; then LIBS="$LIBS -ltermlib" - elif test "$have_libtermcap" = "yes"; then LIBS="$LIBS -ltermcap" - fi - else extra_objs="$extra_objs tparam.o" - if test -n "$libs_termcap"; then LIBS="$LIBS $libs_termcap" - elif test "$have_libtermcap" = "yes"; then LIBS="$LIBS -ltermcap" - elif test "$have_libcurses" = "yes"; then LIBS="$LIBS -lcurses" - else extra_objs="$extra_objs termcap.o" +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + LIBS="-ltermcap $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ltermcap\" to \$LIBS"; fi +else + echo "$ac_t""no" 1>&6 +extra_objs="$extra_objs termcap.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"termcap.o\"" + fi +fi + + +fi + + fi fi fi @@ -8386,28 +8660,26 @@ EOF } -else # "$with_tty" = "no" - for feature in ncurses gpm; do +else for feature in ncurses gpm; do if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then echo "configure: warning: "--with-${feature} ignored: Not valid without TTY support"" 1>&2 fi eval "with_${feature}=no" done -fi - +fi echo "checking for database support" 1>&6 -echo "configure:8401: checking for database support" >&5 - -if test "$with_database_gnudbm" != "no" ; then +echo "configure:8673: checking for database support" >&5 + +if test "$with_database_gnudbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:8406: checking for dbm_open in -lgdbm" >&5 +echo "configure:8678: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <<EOF -#line 8411 "configure" +#line 8683 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8418,7 +8690,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:8422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8430,7 +8702,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 with_database_gnudbm=yes have_libgdbm=yes else @@ -8440,10 +8712,10 @@ if test "$with_database_gnudbm" != "yes"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:8444: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8447 "configure" +echo "configure:8716: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8719 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -8466,7 +8738,7 @@ ; return 0; } EOF -if { (eval echo configure:8470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -8485,7 +8757,7 @@ fi fi - if test "$with_database_gnudbm" = "yes" ; then + if test "$with_database_gnudbm" = "yes"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_DBM EOF @@ -8494,18 +8766,18 @@ EOF } - test "$have_libgdbm" = "yes" && LIBS="$LIBS -lgdbm" + test "$have_libgdbm" = "yes" && LIBS="-lgdbm $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lgdbm\" to \$LIBS"; fi with_database_dbm=no else with_database_gnudbm=no fi fi -if test "$with_database_dbm" != "no" ; then +if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:8506: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8509 "configure" +echo "configure:8778: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8781 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -8528,7 +8800,7 @@ ; return 0; } EOF -if { (eval echo configure:8532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -8549,12 +8821,12 @@ if test "$need_libdbm" != "no"; then echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:8553: checking for dbm_open in -ldbm" >&5 +echo "configure:8825: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <<EOF -#line 8558 "configure" +#line 8830 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8565,7 +8837,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:8569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8577,7 +8849,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 with_database_dbm=yes need_libdbm=yes else @@ -8586,7 +8858,7 @@ fi - if test "$with_database_dbm" = "yes" ; then + if test "$with_database_dbm" = "yes"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_DBM EOF @@ -8595,17 +8867,17 @@ EOF } - test "$need_libdbm" = "yes" && LIBS="$LIBS -ldbm" + test "$need_libdbm" = "yes" && LIBS="-ldbm $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ldbm\" to \$LIBS"; fi else with_database_dbm=no fi fi if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:8606: checking for dbopen" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8609 "configure" +echo "configure:8878: checking for dbopen" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8881 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbopen(); below. */ @@ -8628,7 +8900,7 @@ ; return 0; } EOF -if { (eval echo configure:8632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -8649,12 +8921,12 @@ if test "$need_libdb" != "no"; then echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:8653: checking for dbopen in -ldb" >&5 +echo "configure:8925: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 8658 "configure" +#line 8930 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8665,7 +8937,7 @@ dbopen() ; return 0; } EOF -if { (eval echo configure:8669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8677,7 +8949,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 with_database_berkdb=yes need_libdb=yes else @@ -8689,7 +8961,7 @@ if test "$with_database_berkdb" = "yes"; then for path in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 8693 "configure" +#line 8965 "configure" #include "confdefs.h" #ifdef HAVE_INTTYPES_H #define __BIT_TYPES_DEFINED__ @@ -8707,7 +8979,7 @@ ; return 0; } EOF -if { (eval echo configure:8711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_path="$path"; break else @@ -8735,7 +9007,7 @@ EOF } - test "$need_libdb" = "yes" && LIBS="$LIBS -ldb" + test "$need_libdb" = "yes" && LIBS="-ldb $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ldb\" to \$LIBS"; fi else with_database_berkdb=no fi fi @@ -8751,18 +9023,20 @@ EOF } - extra_objs="$extra_objs database.o" + extra_objs="$extra_objs database.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"database.o\"" + fi fi if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:8761: checking for SOCKSinit in -lsocks" >&5 +echo "configure:9035: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <<EOF -#line 8766 "configure" +#line 9040 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8773,7 +9047,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:8777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8785,7 +9059,7 @@ rm -f conftest* xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 ac_tr_lib=HAVE_LIB`echo socks | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` @@ -8797,7 +9071,7 @@ EOF } - LIBS="-lsocks $LIBS" + LIBS="-lsocks $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lsocks\" to \$LIBS"; fi else echo "$ac_t""no" 1>&6 @@ -8823,91 +9097,27 @@ EOF } - LIBS="$LIBS -Bstatic -lut -Bdynamic" -fi - - -if test "$dynamic" = "no"; then add_runtime_path=no -elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes -else case "$canonical" in - *-solaris2.* | *-sgi-irix* ) add_runtime_path=yes ;; - * ) add_runtime_path=no ;; - esac -fi - -if test "$add_runtime_path" = "yes"; then - echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:8841: checking "for runtime libraries flag"" >&5 - dash_r="" - for try_dash_r in "-R" "-R " "-rpath "; do - xe_check_libs="${try_dash_r}/no/such/file-or-directory" - cat > conftest.$ac_ext <<EOF -#line 8846 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:8853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - dash_r="$try_dash_r" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - xe_check_libs="" - test -n "$dash_r" && break - done - if test -n "$dash_r"; - then echo "$ac_t"""\"${dash_r}\""" 1>&6 - else echo "$ac_t""NONE" 1>&6 - fi -fi - -if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then - ld_switch_site="`echo $ld_switch_site | sed \"s/${dash_r}[^ ]*//\"`" - ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`" - - if test -n "$LD_RUN_PATH"; then - runpath="$LD_RUN_PATH" - else - runpath="" - for arg in $ld_switch_site $ld_switch_x_site; do - case "$arg" in -L* ) - dir=`echo $arg | sed 's/^-L//'` - if test -n "`ls ${dir}/*.so 2>/dev/null`"; then - test -n "$runpath" && runpath="${runpath}:" - runpath="${runpath}${dir}" - fi - ;; - esac - done - case "$canonical" in *-solaris2.* ) - test "$have_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;; - esac - fi - - if test -n "$runpath"; then - ld_switch_site="$ld_switch_site ${dash_r}${runpath}" - test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath" - fi + LIBS="-Bstatic -lut -Bdynamic $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi fi c_switch_general="-DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system" c_switch_window_system="$c_switch_x_site $X_CFLAGS" c_switch_all="$c_switch_general $c_switch_window_system" -ld_switch_general="$ld_switch_site $ld_switch_machine $ld_switch_system" +ld_switch_general="$ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_run" ld_switch_window_system="$ld_switch_x_site" ld_switch_all="$ld_switch_general $ld_switch_window_system" ld_libs_general="$LIBS $libs_machine $libs_system $libs_standard" ld_libs_window_system="$X_PRE_LIBS $libs_x $X_EXTRA_LIBS" ld_libs_all="$ld_libs_window_system $ld_libs_general" +SRC_SUBDIR_DEPS="$MAKE_SUBDIR" + +MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$extra_verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi internal_makefile_list="Makefile" SUBDIR_MAKEFILES='' +test -d lock || mkdir lock for dir in $MAKE_SUBDIR; do + test -d "$dir" || mkdir "$dir" SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $dir/Makefile" internal_makefile_list="$internal_makefile_list $dir/Makefile.in" done @@ -8915,7 +9125,7 @@ if test "$extra_verbose" = "yes"; then - echo "" + echo "" echo "extra_objs = $extra_objs" echo "c_switch_general = $c_switch_general" echo "c_switch_window_system = $c_switch_window_system" @@ -8929,6 +9139,38 @@ echo "" fi +if test -f $srcdir/src/gdbinit -a ! -f src/gdbinit ; then + echo "creating src/gdbinit" + echo "source $srcdir/src/gdbinit" > src/gdbinit +fi + +cat > conftest.$ac_ext <<EOF +#line 9149 "configure" +#include "confdefs.h" + +int main() { +#ifndef __SUNPRO_C +#error No Sun source browser capability +#endif + +; return 0; } +EOF +if { (eval echo configure:9159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "creating .sbinit" +( echo "# For use with Sun WorkShop's Source browser." + echo "# See sbquery(1) and sbinit(4) for more information" + for dir in $MAKE_SUBDIR; do echo "import $dir"; done +) > .sbinit + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + +rm -f core + @@ -8979,14 +9221,6 @@ { test "$extra_verbose" = "yes" && cat << EOF - Defining EMACS_VERSION = $version -EOF -cat >> confdefs.h <<EOF -#define EMACS_VERSION $version -EOF -} - -{ test "$extra_verbose" = "yes" && cat << EOF Defining EMACS_CONFIGURATION = "$canonical" EOF cat >> confdefs.h <<EOF @@ -9010,14 +9244,6 @@ EOF } -{ test "$extra_verbose" = "yes" && cat << EOF - Defining UNEXEC_SRC = $UNEXEC_SRC -EOF -cat >> confdefs.h <<EOF -#define UNEXEC_SRC $UNEXEC_SRC -EOF -} - null_string="" @@ -9313,7 +9539,15 @@ fi test "$with_gif" = yes && echo " Compiling in support for GIF image conversion." -test "$with_xpm" = yes && echo " Compiling in support for XPM images." +if test "$with_xpm" = yes; then + echo " Compiling in support for XPM images." +else + echo " --------------------------------------------------------------------" + echo " WARNING: Compiling without XPM support." + echo " WARNING: You should strongly considering installing XPM." + echo " WARNING: Otherwise toolbars and other graphics will look suboptimal." + echo " --------------------------------------------------------------------" +fi test "$with_xface" = yes && echo " Compiling in support for X-Face message headers." test "$with_jpeg" = yes && echo " Compiling in support for JPEG image conversion." test "$with_png" = yes && echo " Compiling in support for PNG image conversion." @@ -9340,7 +9574,7 @@ test "$with_canna" = yes && echo " Compiling in support for Canna on Mule." if test "$with_wnn" = yes; then echo " Compiling in support for the WNN input method on Mule." - test "$with_wnn6" = yes && echo " WNN support for version 6." + test "$with_wnn6" = yes && echo " Using WNN version 6." fi test "$with_i18n3" = yes && echo " Compiling in I18N support, level 3 (doesn't currently work)." @@ -9376,9 +9610,17 @@ test "$debug" = yes && echo " Compiling in extra code for debugging." test "$memory_usage_stats" = yes && echo " Compiling in code for checking XEmacs memory usage." test "$usage_tracking" = yes && echo " Compiling with usage tracking active (Sun internal)." +if test "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc" \ + != "no no no no no"; then + echo " WARNING: ---------------------------------------------------------" + echo " WARNING: Compiling in support for runtime error checking." + echo " WARNING: XEmacs will run noticeably more slowly as a result." + echo " WARNING: Error checking is on by default for XEmacs beta releases." + echo " WARNING: ---------------------------------------------------------" +fi echo "" ) | tee -a Installation -echo 'The above configure report is appended to "Installation" file.' +echo "The above configure report is appended to \"Installation\" file." echo "" @@ -9488,6 +9730,7 @@ s%@X_LIBS@%$X_LIBS%g s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g s%@ALLOCA@%$ALLOCA%g +s%@SRC_SUBDIR_DEPS@%$SRC_SUBDIR_DEPS%g s%@MAKE_SUBDIR@%$MAKE_SUBDIR%g s%@SUBDIR_MAKEFILES@%$SUBDIR_MAKEFILES%g s%@version@%$version%g @@ -9743,7 +9986,7 @@ for dir in $MAKE_SUBDIR; do echo creating $dir/Makefile - ( set -e + ( cd $dir rm -f junk.c sed -e 's/^# Generated.*//' -e 's%/\*\*/#.*%%' < Makefile.in > junk.c; @@ -9758,7 +10001,6 @@ mv -f Makefile.new Makefile rm -f junk.c junk.cpp ) - test "$?" != 0 && exit "$?" # For debugging done exit 0 @@ -9767,18 +10009,3 @@ rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - -if test ! -f src/gdbinit && test -f $topsrcdir/src/gdbinit; then - echo "creating src/gdbinit" - echo "source $topsrcdir/src/gdbinit" > src/gdbinit -fi - -if test "$sunpro_c" = "yes"; then cat < EOF > .sbinit -# For use with Sun WorkShop's Source browser. -# See sbquery(1) and sbinit(4) for more information -import src -import lwlib -import lib-src -import dynodump -EOF -fi