Mercurial > hg > xemacs-beta
changeset 594:fd49b88b9f06
[xemacs-hg @ 2001-05-31 12:47:21 by ben]
goddamn fucking cvs
| author | ben |
|---|---|
| date | Thu, 31 May 2001 12:47:28 +0000 |
| parents | 5fd7ba8b56e7 |
| children | fec27b06b4e5 |
| files | ChangeLog INSTALL configure configure.in configure.usage |
| diffstat | 5 files changed, 485 insertions(+), 441 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 31 12:45:41 2001 +0000 +++ b/ChangeLog Thu May 31 12:47:28 2001 +0000 @@ -1,3 +1,22 @@ +2001-05-30 Ben Wing <ben@xemacs.org> + + * configure.in (AC_INIT_PARSE_ARGS): + * configure.in (USAGE_ERROR): + * configure.in (XE_COMPUTE_RUNPATH): + Fix problems detecting both native and Linux sound on Cygwin + when compiled with --with-msw=no. + + Rearrange file-coding handling a bit to avoid warning when + compiling with Mule. + +2001-05-28 Martin Buchholz <martin@xemacs.org> + + * configure.in (--xemacs-compiler): New. + * configure.usage: + * INSTALL: + Document XEMACS_CC and corresponding compiler option --xemacs-compiler. + Explain how to build xemacs using a C++ compiler. + 2001-05-29 Martin Buchholz <martin@xemacs.org> * configure.in: Remove stray backslash.
--- a/INSTALL Thu May 31 12:45:41 2001 +0000 +++ b/INSTALL Thu May 31 12:47:28 2001 +0000 @@ -159,6 +159,12 @@ variable CFLAGS is consulted. If that is also undefined, CFLAGS defaults to "-g -O" for gcc and "-g" for all other compilers. +The xemacs executable can be built using a C++ compiler. However, +because configure and programs in lib-src require a C compiler, two +compilers must be used at different times during the build process. +Use something like `configure --compiler=gcc --xemacs-compiler=g++'. +This option is intended for use by the maintainers. + The `--dynamic' option specifies that configure should try to link emacs dynamically rather than statically.
--- a/configure Thu May 31 12:45:41 2001 +0000 +++ b/configure Thu May 31 12:47:28 2001 +0000 @@ -238,7 +238,6 @@ with_scrollbars='' with_widgets='' with_dialogs='' -with_file_coding='no' cpp='' cppflags='' libs='' ldflags='' extra_includes='' dynamic='' @@ -375,6 +374,7 @@ srcdir | \ compiler | \ + xemacs_compiler | \ cflags | \ cpp | \ cppflags | \ @@ -9866,9 +9866,11 @@ fi fi +test -z "$with_file_coding" && with_file_coding=no + if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:9872: checking for Mule-related features" >&5 +echo "configure:9874: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -9893,15 +9895,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9897: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9900 "configure" +echo "configure:9899: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9902 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9932,12 +9934,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:9936: checking for strerror in -lintl" >&5 +echo "configure:9938: 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 9941 "configure" +#line 9943 "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 @@ -9948,7 +9950,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:9952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9981,18 +9983,18 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:9985: checking for Mule input methods" >&5 +echo "configure:9987: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:9988: checking for XIM" >&5 +echo "configure:9990: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:9991: checking for XOpenIM in -lX11" >&5 +echo "configure:9993: checking for XOpenIM in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 9996 "configure" +#line 9998 "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 @@ -10003,7 +10005,7 @@ XOpenIM() ; return 0; } EOF -if { (eval echo configure:10007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10027,12 +10029,12 @@ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:10031: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:10033: 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 10036 "configure" +#line 10038 "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 @@ -10043,7 +10045,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:10047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10108,15 +10110,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:10112: checking for XFontSet" >&5 +echo "configure:10114: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:10115: checking for XmbDrawString in -lX11" >&5 +echo "configure:10117: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 10120 "configure" +#line 10122 "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 @@ -10127,7 +10129,7 @@ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:10131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10167,15 +10169,15 @@ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support 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:10171: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10174 "configure" +echo "configure:10173: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10176 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10198,15 +10200,15 @@ } test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6 -echo "configure:10202: checking for wnn/commonhd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10205 "configure" +echo "configure:10204: checking for wnn/commonhd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10207 "configure" #include "confdefs.h" #include <wnn/commonhd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10231,10 +10233,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10235: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10238 "configure" +echo "configure:10237: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10240 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10257,7 +10259,7 @@ ; return 0; } EOF -if { (eval echo configure:10261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10286,12 +10288,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:10290: checking for crypt in -lcrypt" >&5 +echo "configure:10292: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <<EOF -#line 10295 "configure" +#line 10297 "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 @@ -10302,7 +10304,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:10306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10337,12 +10339,12 @@ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:10341: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:10343: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 10346 "configure" +#line 10348 "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 @@ -10353,7 +10355,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10371,12 +10373,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:10375: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:10377: checking for jl_dic_list_e in -lwnn4" >&5 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn4 " cat > conftest.$ac_ext <<EOF -#line 10380 "configure" +#line 10382 "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 @@ -10387,7 +10389,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10405,12 +10407,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:10409: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:10411: checking for jl_dic_list_e in -lwnn6" >&5 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6 " cat > conftest.$ac_ext <<EOF -#line 10414 "configure" +#line 10416 "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 @@ -10421,7 +10423,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10439,12 +10441,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:10443: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:10445: checking for dic_list_e in -lwnn6_fromsrc" >&5 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6_fromsrc " cat > conftest.$ac_ext <<EOF -#line 10448 "configure" +#line 10450 "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 @@ -10455,7 +10457,7 @@ dic_list_e() ; return 0; } EOF -if { (eval echo configure:10459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10503,12 +10505,12 @@ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:10507: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:10509: checking for jl_fi_dic_list in -l$libwnn" >&5 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -l$libwnn " cat > conftest.$ac_ext <<EOF -#line 10512 "configure" +#line 10514 "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 @@ -10519,7 +10521,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:10523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10554,15 +10556,15 @@ if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:10558: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10561 "configure" +echo "configure:10560: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10563 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10589,15 +10591,15 @@ c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:10593: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10596 "configure" +echo "configure:10595: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10598 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10625,15 +10627,15 @@ 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:10629: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10632 "configure" +echo "configure:10631: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10634 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10656,12 +10658,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:10660: checking for RkBgnBun in -lRKC" >&5 +echo "configure:10662: 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 10665 "configure" +#line 10667 "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 @@ -10672,7 +10674,7 @@ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:10676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10695,12 +10697,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:10699: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:10701: 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 10704 "configure" +#line 10706 "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 @@ -10711,7 +10713,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:10715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10760,12 +10762,12 @@ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:10764: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:10766: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <<EOF -#line 10769 "configure" +#line 10771 "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 @@ -10776,7 +10778,7 @@ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:10780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10862,10 +10864,10 @@ for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo 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 snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10866: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10869 "configure" +echo "configure:10868: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10871 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10888,7 +10890,7 @@ ; return 0; } EOF -if { (eval echo configure:10892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10920,10 +10922,10 @@ for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10924: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10927 "configure" +echo "configure:10926: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10929 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10946,7 +10948,7 @@ ; return 0; } EOF -if { (eval echo configure:10950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10975,10 +10977,10 @@ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:10979: checking for openpty" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10982 "configure" +echo "configure:10981: checking for openpty" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10984 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char openpty(); below. */ @@ -11001,7 +11003,7 @@ ; return 0; } EOF -if { (eval echo configure:11005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openpty=yes" else @@ -11020,12 +11022,12 @@ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:11024: checking for openpty in -lutil" >&5 +echo "configure:11026: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` xe_check_libs=" -lutil " cat > conftest.$ac_ext <<EOF -#line 11029 "configure" +#line 11031 "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 @@ -11036,7 +11038,7 @@ openpty() ; return 0; } EOF -if { (eval echo configure:11040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11071,15 +11073,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11075: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11078 "configure" +echo "configure:11077: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11080 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11116,15 +11118,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11120: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11123 "configure" +echo "configure:11122: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11125 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11157,15 +11159,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11161: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11164 "configure" +echo "configure:11163: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11166 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11198,15 +11200,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11202: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11205 "configure" +echo "configure:11204: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11207 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11242,15 +11244,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11246: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11249 "configure" +echo "configure:11248: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11251 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11283,10 +11285,10 @@ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11287: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11290 "configure" +echo "configure:11289: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11292 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11309,7 +11311,7 @@ ; return 0; } EOF -if { (eval echo configure:11313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11340,15 +11342,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11344: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11347 "configure" +echo "configure:11346: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11349 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11385,10 +11387,10 @@ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11389: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11392 "configure" +echo "configure:11391: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11394 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11411,7 +11413,7 @@ ; return 0; } EOF -if { (eval echo configure:11415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11444,15 +11446,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11448: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11451 "configure" +echo "configure:11450: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11453 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11488,12 +11490,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:11492: checking for kstat_open in -lkstat" >&5 +echo "configure:11494: 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 11497 "configure" +#line 11499 "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 @@ -11504,7 +11506,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:11508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11539,15 +11541,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11543: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11546 "configure" +echo "configure:11545: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11548 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11579,12 +11581,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:11583: checking for kvm_read in -lkvm" >&5 +echo "configure:11585: 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 11588 "configure" +#line 11590 "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 @@ -11595,7 +11597,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:11599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11629,16 +11631,16 @@ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:11633: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 11635 "configure" +echo "configure:11635: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 11637 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:11642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -11658,16 +11660,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:11662: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 11664 "configure" +echo "configure:11664: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 11666 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:11671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11673: \"$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 @@ -11687,11 +11689,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:11691: checking whether localtime caches TZ" >&5 +echo "configure:11693: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 11695 "configure" +#line 11697 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -11726,7 +11728,7 @@ exit (0); } EOF -if { (eval echo configure:11730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -11756,9 +11758,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:11760: checking whether gettimeofday accepts one or two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 11762 "configure" +echo "configure:11762: checking whether gettimeofday accepts one or two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 11764 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -11779,7 +11781,7 @@ ; return 0; } EOF -if { (eval echo configure:11783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""two" 1>&6 else @@ -11801,19 +11803,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:11805: checking for inline" >&5 +echo "configure:11807: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 11810 "configure" +#line 11812 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:11817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -11854,17 +11856,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:11858: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11861 "configure" +echo "configure:11860: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11863 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:11868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -11888,10 +11890,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:11892: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11895 "configure" +echo "configure:11894: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11897 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -11919,7 +11921,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:11923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -11958,10 +11960,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:11962: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11965 "configure" +echo "configure:11964: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11967 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -11985,10 +11987,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:11989: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11992 "configure" +echo "configure:11991: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11994 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12011,7 +12013,7 @@ ; return 0; } EOF -if { (eval echo configure:12015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12041,10 +12043,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:12045: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12048 "configure" +echo "configure:12047: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12050 "configure" #include "confdefs.h" find_stack_direction () { @@ -12063,7 +12065,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:12067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -12093,15 +12095,15 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:12097: checking for vfork.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12100 "configure" +echo "configure:12099: checking for vfork.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12102 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12129,10 +12131,10 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:12133: checking for working vfork" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12136 "configure" +echo "configure:12135: checking for working vfork" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12138 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -12227,7 +12229,7 @@ } } EOF -if { (eval echo configure:12231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_vfork_works=yes else @@ -12253,10 +12255,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:12257: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12260 "configure" +echo "configure:12259: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12262 "configure" #include "confdefs.h" #include <string.h> main () @@ -12266,7 +12268,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:12270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -12294,10 +12296,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12298: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12301 "configure" +echo "configure:12300: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12303 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12320,7 +12322,7 @@ ; return 0; } EOF -if { (eval echo configure:12324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12348,10 +12350,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:12352: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12355 "configure" +echo "configure:12354: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12357 "configure" #include "confdefs.h" /* @@ -12406,7 +12408,7 @@ } EOF -if { (eval echo configure:12410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -12433,10 +12435,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:12437: checking for working mmap" >&5 +echo "configure:12439: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 12440 "configure" +#line 12442 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -12469,7 +12471,7 @@ return 1; } EOF -if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -12498,9 +12500,9 @@ if test "$rel_alloc $have_mmap" = "default yes"; then if test "$doug_lea_malloc" = "yes"; then echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6 -echo "configure:12502: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:12504: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 12504 "configure" +#line 12506 "configure" #include "confdefs.h" #include <malloc.h> int main() { @@ -12512,7 +12514,7 @@ ; return 0; } EOF -if { (eval echo configure:12516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -12537,15 +12539,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:12541: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12544 "configure" +echo "configure:12543: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12546 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12588,15 +12590,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:12592: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12595 "configure" +echo "configure:12594: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12597 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12628,10 +12630,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:12632: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12635 "configure" +echo "configure:12634: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12637 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -12654,7 +12656,7 @@ ; return 0; } EOF -if { (eval echo configure:12658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -12669,15 +12671,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:12673: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12676 "configure" +echo "configure:12675: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12678 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12694,15 +12696,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:12698: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12701 "configure" +echo "configure:12700: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12703 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12727,9 +12729,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:12731: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:12733: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 12733 "configure" +#line 12735 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12740,7 +12742,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:12744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN @@ -12758,9 +12760,9 @@ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:12762: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:12764: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 12764 "configure" +#line 12766 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12770,7 +12772,7 @@ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:12774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST @@ -12801,10 +12803,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:12805: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12808 "configure" +echo "configure:12807: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12810 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -12827,7 +12829,7 @@ ; return 0; } EOF -if { (eval echo configure:12831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -12842,15 +12844,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:12846: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12849 "configure" +echo "configure:12848: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12851 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12867,15 +12869,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:12871: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12874 "configure" +echo "configure:12873: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12876 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12913,15 +12915,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:12917: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12920 "configure" +echo "configure:12919: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12922 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12948,15 +12950,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:12952: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12955 "configure" +echo "configure:12954: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12957 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12989,15 +12991,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:12993: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12996 "configure" +echo "configure:12995: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12998 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13027,22 +13029,22 @@ echo "checking "for sound support"" 1>&6 -echo "configure:13031: checking "for sound support"" >&5 +echo "configure:13033: checking "for sound support"" >&5 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes if test "$with_native_sound" != "no"; then if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:13038: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13041 "configure" +echo "configure:13040: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13043 "configure" #include "confdefs.h" #include <multimedia/audio_device.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13090,12 +13092,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:13094: checking for ALopenport in -laudio" >&5 +echo "configure:13096: 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 13099 "configure" +#line 13101 "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 @@ -13106,7 +13108,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:13110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13137,12 +13139,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:13141: checking for AOpenAudio in -lAlib" >&5 +echo "configure:13143: 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 13146 "configure" +#line 13148 "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 @@ -13153,7 +13155,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:13157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13189,8 +13191,11 @@ if test -z "$sound_found"; then if test "$with_msw" = "yes"; then - sound_found=yes - native_sound_lib= + sound_found=yes + native_sound_lib= + extra_objs="$extra_objs ntplay.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"ntplay.o\"" + fi fi fi @@ -13198,15 +13203,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:13202: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13205 "configure" +echo "configure:13207: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13210 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13260,15 +13265,15 @@ if test "$with_nas_sound" != "no"; then ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6 -echo "configure:13264: checking for audio/audiolib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13267 "configure" +echo "configure:13269: checking for audio/audiolib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13272 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13286,12 +13291,12 @@ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:13290: checking for AuOpenServer in -laudio" >&5 +echo "configure:13295: checking for AuOpenServer in -laudio" >&5 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 13295 "configure" +#line 13300 "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 @@ -13302,7 +13307,7 @@ AuOpenServer() ; return 0; } EOF -if { (eval echo configure:13306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13341,7 +13346,7 @@ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext <<EOF -#line 13345 "configure" +#line 13350 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -13372,7 +13377,7 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13376: checking for $ac_word" >&5 +echo "configure:13381: checking for $ac_word" >&5 if test -n "$have_esd_config"; then ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test. @@ -13401,10 +13406,10 @@ c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6 -echo "configure:13405: checking for esd_play_stream" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13408 "configure" +echo "configure:13410: checking for esd_play_stream" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13413 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ @@ -13427,7 +13432,7 @@ ; return 0; } EOF -if { (eval echo configure:13431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_esd_play_stream=yes" else @@ -13478,7 +13483,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:13482: checking for TTY-related features" >&5 +echo "configure:13487: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -13494,12 +13499,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:13498: checking for tgetent in -lncurses" >&5 +echo "configure:13503: 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 13503 "configure" +#line 13508 "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 @@ -13510,7 +13515,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13543,15 +13548,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:13547: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13550 "configure" +echo "configure:13552: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13555 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13573,15 +13578,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:13577: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13580 "configure" +echo "configure:13582: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13585 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13611,15 +13616,15 @@ 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:13615: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13618 "configure" +echo "configure:13620: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13623 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13654,12 +13659,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:13658: checking for tgetent in -l$lib" >&5 +echo "configure:13663: 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 13663 "configure" +#line 13668 "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 @@ -13670,7 +13675,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13701,12 +13706,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:13705: checking for tgetent in -lcurses" >&5 +echo "configure:13710: 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 13710 "configure" +#line 13715 "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 @@ -13717,7 +13722,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13735,12 +13740,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:13739: checking for tgetent in -ltermcap" >&5 +echo "configure:13744: 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 13744 "configure" +#line 13749 "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 @@ -13751,7 +13756,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13799,15 +13804,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:13803: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13806 "configure" +echo "configure:13808: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13811 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13830,12 +13835,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:13834: checking for Gpm_Open in -lgpm" >&5 +echo "configure:13839: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <<EOF -#line 13839 "configure" +#line 13844 "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 @@ -13846,7 +13851,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:13850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13896,20 +13901,20 @@ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:13900: checking for database support" >&5 +echo "configure:13905: checking for database support" >&5 if test "$with_database_gdbm $with_database_dbm" != "no no"; then ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:13905: checking for ndbm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13908 "configure" +echo "configure:13910: checking for ndbm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13913 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13939,12 +13944,12 @@ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:13943: checking for dbm_open in -lgdbm" >&5 +echo "configure:13948: 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 13948 "configure" +#line 13953 "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 @@ -13955,7 +13960,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:13959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13983,10 +13988,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:13987: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13990 "configure" +echo "configure:13992: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13995 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -14009,7 +14014,7 @@ ; return 0; } EOF -if { (eval echo configure:14013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -14028,12 +14033,12 @@ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:14032: checking for dbm_open in -ldbm" >&5 +echo "configure:14037: 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 14037 "configure" +#line 14042 "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 @@ -14044,7 +14049,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:14048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14085,10 +14090,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:14089: checking for Berkeley db.h" >&5 +echo "configure:14094: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 14092 "configure" +#line 14097 "configure" #include "confdefs.h" #include <stdlib.h> @@ -14110,7 +14115,7 @@ ; return 0; } EOF -if { (eval echo configure:14114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -14126,9 +14131,9 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:14130: checking for Berkeley DB version" >&5 +echo "configure:14135: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 14132 "configure" +#line 14137 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 @@ -14140,7 +14145,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 14144 "configure" +#line 14149 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 @@ -14167,10 +14172,10 @@ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:14171: checking for $dbfunc" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14174 "configure" +echo "configure:14176: checking for $dbfunc" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14179 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ @@ -14193,7 +14198,7 @@ ; return 0; } EOF -if { (eval echo configure:14197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$dbfunc=yes" else @@ -14212,12 +14217,12 @@ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:14216: checking for $dbfunc in -ldb" >&5 +echo "configure:14221: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 14221 "configure" +#line 14226 "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 @@ -14228,7 +14233,7 @@ $dbfunc() ; return 0; } EOF -if { (eval echo configure:14232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14292,12 +14297,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:14296: checking for SOCKSinit in -lsocks" >&5 +echo "configure:14301: 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 14301 "configure" +#line 14306 "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 @@ -14308,7 +14313,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:14312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14363,22 +14368,22 @@ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:14367: checking for module support" >&5 +echo "configure:14372: checking for module support" >&5 if test "$with_msw" = "yes"; then have_dl=yes; else ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:14374: checking for dlfcn.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14377 "configure" +echo "configure:14379: checking for dlfcn.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14382 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14395,16 +14400,16 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:14399: checking for dlopen in -lc" >&5 +echo "configure:14404: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 14401 "configure" +#line 14406 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14413,18 +14418,18 @@ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:14417: checking for dlopen in -ldl" >&5 +echo "configure:14422: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 14421 "configure" +#line 14426 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14453,12 +14458,12 @@ else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:14457: checking for shl_load in -ldld" >&5 +echo "configure:14462: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <<EOF -#line 14462 "configure" +#line 14467 "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 @@ -14469,7 +14474,7 @@ shl_load() ; return 0; } EOF -if { (eval echo configure:14473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14496,12 +14501,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:14500: checking for dld_init in -ldld" >&5 +echo "configure:14505: checking for dld_init in -ldld" >&5 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <<EOF -#line 14505 "configure" +#line 14510 "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 @@ -14512,7 +14517,7 @@ dld_init() ; return 0; } EOF -if { (eval echo configure:14516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14557,7 +14562,7 @@ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:14561: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:14566: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; @@ -14585,9 +14590,9 @@ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:14589: checking checking whether we are using GNU C" >&5 +echo "configure:14594: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 14591 "configure" +#line 14596 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -14609,7 +14614,7 @@ fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:14613: checking how to produce PIC code" >&5 +echo "configure:14618: checking how to produce PIC code" >&5 wl= can_build_shared=yes @@ -14710,18 +14715,18 @@ # Check to make sure the dll_cflags actually works. echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6 -echo "configure:14714: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:14719: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 14718 "configure" +#line 14723 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:14725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also @@ -14752,7 +14757,7 @@ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:14756: checking if C compiler can produce shared libraries" >&5 +echo "configure:14761: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes; then xcldf="-shared" xldf="-shared" @@ -14803,14 +14808,14 @@ xe_libs= ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cat > conftest.$ac_ext <<EOF -#line 14807 "configure" +#line 14812 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:14814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else @@ -14835,7 +14840,7 @@ if test "$XEGCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:14839: checking for ld used by GCC" >&5 +echo "configure:14844: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -14860,7 +14865,7 @@ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:14864: checking for GNU ld" >&5 +echo "configure:14869: checking for GNU ld" >&5 fi if test -z "$LTLD"; then @@ -14898,7 +14903,7 @@ # Check to see if it really is or isn't GNU ld. echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6 -echo "configure:14902: checking if the linker is GNU ld" >&5 +echo "configure:14907: checking if the linker is GNU ld" >&5 # I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then xe_gnu_ld=yes @@ -14926,7 +14931,7 @@ # OK - only NOW do we futz about with ld. # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6 -echo "configure:14930: checking whether the linker supports shared libraries" >&5 +echo "configure:14935: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes @@ -15137,10 +15142,10 @@ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15141: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15144 "configure" +echo "configure:15146: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15149 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15163,7 +15168,7 @@ ; return 0; } EOF -if { (eval echo configure:15167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15202,11 +15207,11 @@ fi cat > conftest.$ac_ext <<EOF -#line 15206 "configure" +#line 15211 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:15210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -15549,7 +15554,9 @@ -: ${XEMACS_CC:=$CC} + +test -n "$xemacs_compiler" && XEMACS_CC="$xemacs_compiler" +: ${XEMACS_CC:="$CC"} if test "$with_prefix" = "yes"; then
--- a/configure.in Thu May 31 12:45:41 2001 +0000 +++ b/configure.in Thu May 31 12:47:28 2001 +0000 @@ -349,10 +349,6 @@ with_scrollbars='' with_widgets='' with_dialogs='' -dnl The following will be overridden if we are under Cygwin and compile -dnl with MS Windows support. Set this to yes as soon as we've fixed -dnl the coding-system defaults to be binary in all cases under Unix. -with_file_coding='no' cpp='' cppflags='' libs='' ldflags='' extra_includes='' dynamic='' @@ -529,6 +525,7 @@ dnl The cache-file option is ignored (for compatibility with other configures) srcdir | \ compiler | \ + xemacs_compiler | \ cflags | \ cpp | \ cppflags | \ @@ -3616,6 +3613,9 @@ XE_ADD_OBJS(file-coding.o) fi +dnl will change to yes as soon as my mule ws is merged in. +test -z "$with_file_coding" && with_file_coding=no + if test "$with_mule" = "yes" ; then AC_CHECKING(for Mule-related features) AC_DEFINE(MULE) @@ -4084,12 +4084,13 @@ dnl Win32 Native uses native sound if test -z "$sound_found"; then if test "$with_msw" = "yes"; then - sound_found=yes - native_sound_lib= + sound_found=yes + native_sound_lib= + XE_ADD_OBJS(ntplay.o) fi fi - dnl Check for Linux/BSD native sound + dnl Check for Linux/BSD native sound (also on recent Cygwins) if test -z "$sound_found"; then for dir in "machine" "sys" "linux"; do AC_CHECK_HEADER(${dir}/soundcard.h, @@ -4710,9 +4711,18 @@ AC_SUBST(RANLIB) AC_SUBST(dynodump_arch) -dnl Preliminary support for using a different compiler for xemacs itself. -dnl Useful for building XEmacs with a C++ or 64-bit compiler. -: ${XEMACS_CC:=$CC} +dnl Support for using a different compiler for xemacs itself. +dnl Useful for building XEmacs with a C++ compiler. +dnl For example, `configure --compiler=gcc --xemacs-compiler=g++ + +dnl The compiler used to build xemacs, as opposed to the compiler +dnl used by configure and lib-src, is determined from the following +dnl sources, in order of priority: +dnl o --xemacs-compiler configure flag +dnl o XEMACS_CC environment variable +dnl o same as the regular compiler, (determined previously) +test -n "$xemacs_compiler" && XEMACS_CC="$xemacs_compiler" +: ${XEMACS_CC:="$CC"} AC_SUBST(XEMACS_CC) dnl The default is yes
--- a/configure.usage Thu May 31 12:45:41 2001 +0000 +++ b/configure.usage Thu May 31 12:47:28 2001 +0000 @@ -29,6 +29,7 @@ Compilation options: --compiler=PROG C compiler to use +--xemacs-compiler=PROG compiler to use to compile just the xemacs executable --with-gcc (*) Use GCC to compile XEmacs. --cflags=FLAGS Compiler flags (such as -O) --cpp=PROG C preprocessor to use (e.g. /usr/ccs/lib/cpp or cc -E) @@ -278,6 +279,7 @@ variable configure flag ----------- -------------- CC --compiler +XEMACS_CC --xemacs-compiler CPP --cpp CFLAGS --cflags CPPFLAGS --cppflags