CVS update by vins xemacs/etc ...

User: vins Date: 05/12/01 00:59:18 Branch: xemacs release-21-4 xemacs/etc release-21-4 Modified: xemacs/etc NEWS Log: Fix ldap library configuration. Revision Changes Path 1.241.2.80 +10 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.241.2.79 retrieving revision 1.241.2.80 diff -u -p -r1.241.2.79 -r1.241.2.80 --- ChangeLog 2005/11/28 02:08:55 1.241.2.79 +++ ChangeLog 2005/11/30 23:58:06 1.241.2.80 ＠＠ -1,3 +1,13 ＠＠ +2005-11-29 Ilya Golubev <golubev(a)xemacs.org&gt; + + * configure.in: Merge revision 1.19 change: fix ldap libraries + configuration lossage when `-lldap -llber' links and but `-lldap' + does not; allow `ldap_libs' to be empty or overridden by builder. + The lossage was introduced in upstream revision 1.151.2.31 + (2005/01/31 02:54:47 vins) by (extremely hasty and unwise) merge + of revision 1.232 change. + * etc/NEWS: Document it. + 2005-03-12 Aidan Kehoe <kehoea(a)parhasard.net&gt; * configure.in (XE_COMPUTE_RUNPATH): Check XtRegisterDrawable 1.147.2.36 +578 -508 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.147.2.35 retrieving revision 1.147.2.36 diff -u -p -r1.147.2.35 -r1.147.2.36 --- configure 2005/11/28 02:08:56 1.147.2.35 +++ configure 2005/11/30 23:58:07 1.147.2.36 ＠＠ -7829,26 +7829,73 ＠＠ else with_ldap=no fi } -if test "$with_ldap" != "no"; then - -echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:7836: checking for ldap_search in -lldap" >&5 -ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'` +if test no != "$with_ldap";then + if test . != "${ldap_libs+.}";then + ldap_libs= + echo $ac_n "checking for ldap_open""... $ac_c" 1>&6 +echo "configure:7837: checking for ldap_open" >&5 +cat > conftest.$ac_ext <<EOF +#line 7840 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char ldap_open(); 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 ldap_open(); + +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_ldap_open) || defined (__stub___ldap_open) +choke me +#else +ldap_open(); +#endif + +; return 0; } +EOF +if { (eval echo configure:7863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_ldap_open=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_ldap_open=no" +fi +rm -f conftest* + +if eval "test \"`echo '$ac_cv_func_'ldap_open`\" = yes"; then + echo "$ac_t""yes" 1>&6 + with_ldap=yes + test yes = "$extra_verbose" && + echo "Setting ldap_libs to $ldap_libs" +else + echo "$ac_t""no" 1>&6 + +echo $ac_n "checking for ldap_open in -lldap""... $ac_c" 1>&6 +echo "configure:7883: checking for ldap_open in -lldap" >&5 +ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` + xe_check_libs=" -lldap " cat > conftest.$ac_ext <<EOF -#line 7841 "configure" +#line 7888 "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 ldap_search(); +char ldap_open(); int main() { -ldap_search() +ldap_open() ; return 0; } EOF -if { (eval echo configure:7852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7899: \"$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 ＠＠ -7865,19 +7912,17 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l with_ldap=yes else echo "$ac_t""no" 1>&6 -fi - - - test "$with_ldap" != "yes" && { +ldap_needs_lber=yes ldap_other_libs=-llber + xe_msg_checking="for ldap_open in -lldap" -test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber" +test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7876: checking "$xe_msg_checking"" >&5 +echo "configure:7921: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` -xe_check_libs=" -lldap -llber" +xe_check_libs=" -lldap $ldap_other_libs" cat > conftest.$ac_ext <<EOF -#line 7881 "configure" +#line 7926 "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 ＠＠ -7888,7 +7933,7 ＠＠ int main() { ldap_open() ; return 0; } EOF -if { (eval echo configure:7892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7937: \"$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 ＠＠ -7902,22 +7947,20 ＠＠ xe_check_libs="" if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 - with_ldap=yes with_ldap_lber=yes + with_ldap=yes else echo "$ac_t""no" 1>&6 -fi - - } - test "$with_ldap" != "yes" && { +ldap_needs_krb=yes ldap_other_libs="$ldap_other_libs -lkrb" + xe_msg_checking="for ldap_open in -lldap" -test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb" +test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7916: checking "$xe_msg_checking"" >&5 +echo "configure:7959: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` -xe_check_libs=" -lldap -llber -lkrb" +xe_check_libs=" -lldap $ldap_other_libs" cat > conftest.$ac_ext <<EOF -#line 7921 "configure" +#line 7964 "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 ＠＠ -7928,7 +7971,7 ＠＠ int main() { ldap_open() ; return 0; } EOF -if { (eval echo configure:7932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7975: \"$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 ＠＠ -7942,22 +7985,20 ＠＠ xe_check_libs="" if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 - with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes + with_ldap=yes else echo "$ac_t""no" 1>&6 -fi - - } - test "$with_ldap" != "yes" && { +ldap_needs_des=yes ldap_other_libs="$ldap_other_libs -ldes" + xe_msg_checking="for ldap_open in -lldap" -test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes" +test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7956: checking "$xe_msg_checking"" >&5 +echo "configure:7997: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` -xe_check_libs=" -lldap -llber -lkrb -ldes" +xe_check_libs=" -lldap $ldap_other_libs" cat > conftest.$ac_ext <<EOF -#line 7961 "configure" +#line 8002 "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 ＠＠ -7968,7 +8009,7 ＠＠ int main() { ldap_open() ; return 0; } EOF -if { (eval echo configure:7972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8013: \"$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 ＠＠ -7982,50 +8023,88 ＠＠ xe_check_libs="" if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 - with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes + with_ldap=yes else echo "$ac_t""no" 1>&6 +with_ldap=no fi - } - test "$with_ldap_lber" != "yes" && { -echo $ac_n "checking for ber_pvt_opt_on in -llber""... $ac_c" 1>&6 -echo "configure:7994: checking for ber_pvt_opt_on in -llber" >&5 -ac_lib_var=`echo lber'_'ber_pvt_opt_on | sed 'y%./+-%__p_%'` + +fi + + +fi + + +fi + -xe_check_libs=" -llber " + if test yes = "$with_ldap";then + if test yes = "$ldap_needs_des";then + ldap_libs="-ldes $ldap_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ldes\" to \$ldap_libs"; fi + fi + if test yes = "$ldap_needs_krb";then + ldap_libs="-lkrb $ldap_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lkrb\" to \$ldap_libs"; fi + fi + if test yes = "$ldap_needs_lber";then + ldap_libs="-llber $ldap_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-llber\" to \$ldap_libs"; fi + fi + ldap_libs="-lldap $ldap_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lldap\" to \$ldap_libs"; fi + fi +fi + + else + save_LIBS="$LIBS" LIBS="$ldap_libs $LIBS" + echo $ac_n "checking for ldap_open""... $ac_c" 1>&6 +echo "configure:8060: checking for ldap_open" >&5 + cat > conftest.$ac_ext <<EOF -#line 7999 "configure" +#line 8063 "configure" #include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char ldap_open(); 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 ber_pvt_opt_on(); +char ldap_open(); int main() { -ber_pvt_opt_on() + +/* 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_ldap_open) || defined (__stub___ldap_open) +choke me +#else +ldap_open(); +#endif + ; return 0; } EOF -if { (eval echo configure:8010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8086: \"$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" + eval "ac_cv_func_ldap_open=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_ldap_open=no" fi rm -f conftest* -xe_check_libs="" -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then +if eval "test \"`echo '$ac_cv_func_'ldap_open`\" = yes"; then echo "$ac_t""yes" 1>&6 - with_ldap_lber=yes + with_ldap=yes + test yes = "$extra_verbose" && + echo "Setting ldap_libs to $ldap_libs" else echo "$ac_t""no" 1>&6 + with_ldap=no fi - } + LIBS="$save_LIBS" + fi fi if test "$with_ldap" = "yes"; then { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -8039,23 +8118,14 ＠＠ EOF extra_objs="$extra_objs eldap.o" && if test "$extra_verbose" = "yes"; then echo " xemacs will be linked with \"eldap.o\"" fi - if test "$with_ldap_des" = "yes" ; then - LIBS="-ldes $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ldes\" to \$LIBS"; fi - fi - if test "$with_ldap_krb" = "yes" ; then - LIBS="-lkrb $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lkrb\" to \$LIBS"; fi - fi - if test "$with_ldap_lber" = "yes" ; then - LIBS="-llber $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-llber\" to \$LIBS"; fi - fi - LIBS="-lldap $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lldap\" to \$LIBS"; fi + LIBS="$ldap_libs $LIBS" for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8056: checking for $ac_func" >&5 +echo "configure:8126: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 8059 "configure" +#line 8129 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -8078,7 +8148,7 ＠＠ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8152: \"$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 ＠＠ -8109,20 +8179,20 ＠＠ fi if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:8113: checking for PostgreSQL" >&5 +echo "configure:8183: checking for PostgreSQL" >&5 for header_dir in "" "pgsql/" "postgresql/"; do ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6 -echo "configure:8118: checking for ${header_dir}libpq-fe.h" >&5 +echo "configure:8188: checking for ${header_dir}libpq-fe.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8121 "configure" +#line 8191 "configure" #include "confdefs.h" #include <${header_dir}libpq-fe.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8196: \"$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* ＠＠ -8146,12 +8216,12 ＠＠ fi test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:8150: checking for PQconnectdb in -lpq" >&5 +echo "configure:8220: checking for PQconnectdb in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 8155 "configure" +#line 8225 "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 ＠＠ -8162,7 +8232,7 ＠＠ int main() { PQconnectdb() ; return 0; } EOF -if { (eval echo configure:8166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8236: \"$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 ＠＠ -8195,12 +8265,12 ＠＠ EOF echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:8199: checking for PQconnectStart in -lpq" >&5 +echo "configure:8269: checking for PQconnectStart in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 8204 "configure" +#line 8274 "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 ＠＠ -8211,7 +8281,7 ＠＠ int main() { PQconnectStart() ; return 0; } EOF -if { (eval echo configure:8215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8285: \"$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 ＠＠ -8259,7 +8329,7 ＠＠ fi if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:8263: checking for graphics libraries" >&5 +echo "configure:8333: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= ＠＠ -8285,10 +8355,10 ＠＠ echo "configure:8263: checking for graph CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:8289: checking for Xpm - no older than 3.4f" >&5 +echo "configure:8359: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 8292 "configure" +#line 8362 "configure" #include "confdefs.h" #define XPM_NUMBERS #include <X11/xpm.h> ＠＠ -8297,7 +8367,7 ＠＠ echo "configure:8289: checking for Xpm - XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:8301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; xpm_status=$?; if test "$xpm_status" = "0"; then ＠＠ -8341,17 +8411,17 ＠＠ EOF libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:8345: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:8415: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 8348 "configure" +#line 8418 "configure" #include "confdefs.h" int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:8355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else ＠＠ -8377,15 +8447,15 ＠＠ EOF 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:8381: checking for compface.h" >&5 +echo "configure:8451: checking for compface.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8384 "configure" +#line 8454 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8459: \"$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* ＠＠ -8408,12 +8478,12 ＠＠ fi } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:8412: checking for UnGenFace in -lcompface" >&5 +echo "configure:8482: 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 8417 "configure" +#line 8487 "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 ＠＠ -8424,7 +8494,7 ＠＠ int main() { UnGenFace() ; return 0; } EOF -if { (eval echo configure:8428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8498: \"$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 ＠＠ -8476,12 +8546,12 ＠＠ EOF if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:8480: checking for inflate in -lc" >&5 +echo "configure:8550: checking for inflate in -lc" >&5 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <<EOF -#line 8485 "configure" +#line 8555 "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 ＠＠ -8492,7 +8562,7 ＠＠ int main() { inflate() ; return 0; } EOF -if { (eval echo configure:8496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8566: \"$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 ＠＠ -8511,12 +8581,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:8515: checking for inflate in -lz" >&5 +echo "configure:8585: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lz " cat > conftest.$ac_ext <<EOF -#line 8520 "configure" +#line 8590 "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 ＠＠ -8527,7 +8597,7 ＠＠ int main() { inflate() ; return 0; } EOF -if { (eval echo configure:8531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8601: \"$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 ＠＠ -8546,12 +8616,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:8550: checking for inflate in -lgz" >&5 +echo "configure:8620: checking for inflate in -lgz" >&5 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lgz " cat > conftest.$ac_ext <<EOF -#line 8555 "configure" +#line 8625 "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 ＠＠ -8562,7 +8632,7 ＠＠ int main() { inflate() ; return 0; } EOF -if { (eval echo configure:8566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8636: \"$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 ＠＠ -8592,15 +8662,15 ＠＠ 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:8596: checking for jpeglib.h" >&5 +echo "configure:8666: checking for jpeglib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8599 "configure" +#line 8669 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8674: \"$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* ＠＠ -8623,12 +8693,12 ＠＠ fi } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:8627: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:8697: 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 8632 "configure" +#line 8702 "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 ＠＠ -8639,7 +8709,7 ＠＠ int main() { jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:8643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8713: \"$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 ＠＠ -8675,10 +8745,10 ＠＠ EOF png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:8679: checking for pow" >&5 +echo "configure:8749: checking for pow" >&5 cat > conftest.$ac_ext <<EOF -#line 8682 "configure" +#line 8752 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ ＠＠ -8701,7 +8771,7 ＠＠ pow(); ; return 0; } EOF -if { (eval echo configure:8705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pow=yes" else ＠＠ -8722,15 +8792,15 ＠＠ 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:8726: checking for png.h" >&5 +echo "configure:8796: checking for png.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8729 "configure" +#line 8799 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8804: \"$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* ＠＠ -8753,12 +8823,12 ＠＠ fi } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:8757: checking for png_read_image in -lpng" >&5 +echo "configure:8827: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng " cat > conftest.$ac_ext <<EOF -#line 8762 "configure" +#line 8832 "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 ＠＠ -8769,7 +8839,7 ＠＠ int main() { png_read_image() ; return 0; } EOF -if { (eval echo configure:8773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8843: \"$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 ＠＠ -8792,10 +8862,10 ＠＠ fi } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:8796: checking for workable png version information" >&5 +echo "configure:8866: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext <<EOF -#line 8799 "configure" +#line 8869 "configure" #include "confdefs.h" #include <png.h> int main(int c, char **v) { ＠＠ -8803,7 +8873,7 ＠＠ echo "configure:8796: checking for worka if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:8807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; png_status=$?; if test "$png_status" = "0"; then ＠＠ -8846,15 +8916,15 ＠＠ EOF test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:8850: checking for tiffio.h" >&5 +echo "configure:8920: checking for tiffio.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8853 "configure" +#line 8923 "configure" #include "confdefs.h" #include <tiffio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8928: \"$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* ＠＠ -8877,12 +8947,12 ＠＠ fi } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:8881: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:8951: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <<EOF -#line 8886 "configure" +#line 8956 "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 ＠＠ -8893,7 +8963,7 ＠＠ int main() { TIFFClientOpen() ; return 0; } EOF -if { (eval echo configure:8897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8967: \"$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 ＠＠ -8932,15 +9002,15 ＠＠ fi if test "$with_gtk" = "yes"; then 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:8936: checking for compface.h" >&5 +echo "configure:9006: checking for compface.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8939 "configure" +#line 9009 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9014: \"$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* ＠＠ -8963,12 +9033,12 ＠＠ fi } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:8967: checking for UnGenFace in -lcompface" >&5 +echo "configure:9037: 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 8972 "configure" +#line 9042 "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 ＠＠ -8979,7 +9049,7 ＠＠ int main() { UnGenFace() ; return 0; } EOF -if { (eval echo configure:8983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9053: \"$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 ＠＠ -9018,12 +9088,12 ＠＠ fi if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:9022: checking for X11 graphics libraries" >&5 +echo "configure:9092: checking for X11 graphics libraries" >&5 fi if test "$with_x11" = "yes"; then echo "checking for the Athena widgets" 1>&6 -echo "configure:9027: checking for the Athena widgets" >&5 +echo "configure:9097: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; ＠＠ -9039,12 +9109,12 ＠＠ echo "configure:9027: checking for the A if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9043: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:9113: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 9048 "configure" +#line 9118 "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 ＠＠ -9055,7 +9125,7 ＠＠ int main() { XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:9059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9129: \"$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 ＠＠ -9071,12 +9141,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9075: checking for $athena_3d_function in -l$athena_variant" >&5 +echo "configure:9145: checking for $athena_3d_function in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 9080 "configure" +#line 9150 "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 ＠＠ -9087,7 +9157,7 ＠＠ int main() { $athena_3d_function() ; return 0; } EOF -if { (eval echo configure:9091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9161: \"$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 ＠＠ -9118,12 +9188,12 ＠＠ fi else echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9122: checking for $athena_3d_function in -l$athena_variant" >&5 +echo "configure:9192: checking for $athena_3d_function in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 9127 "configure" +#line 9197 "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 ＠＠ -9134,7 +9204,7 ＠＠ int main() { $athena_3d_function() ; return 0; } EOF -if { (eval echo configure:9138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9208: \"$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 ＠＠ -9152,12 +9222,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for $athena_3d_function in -lXaw""... $ac_c" 1>&6 -echo "configure:9156: checking for $athena_3d_function in -lXaw" >&5 +echo "configure:9226: checking for $athena_3d_function in -lXaw" >&5 ac_lib_var=`echo Xaw'_'$athena_3d_function | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 9161 "configure" +#line 9231 "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 ＠＠ -9168,7 +9238,7 ＠＠ int main() { $athena_3d_function() ; return 0; } EOF -if { (eval echo configure:9172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9242: \"$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 ＠＠ -9199,15 +9269,15 ＠＠ fi if test "$athena_3d" = "no"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9203: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:9273: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9206 "configure" +#line 9276 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9281: \"$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* ＠＠ -9227,15 +9297,15 ＠＠ else echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6 -echo "configure:9231: checking for X11/Xaw/XawInit.h" >&5 +echo "configure:9301: checking for X11/Xaw/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9234 "configure" +#line 9304 "configure" #include "confdefs.h" #include <X11/Xaw/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9309: \"$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* ＠＠ -9261,15 +9331,15 ＠＠ fi else ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:9265: checking for X11/$athena_variant/XawInit.h" >&5 +echo "configure:9335: checking for X11/$athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9268 "configure" +#line 9338 "configure" #include "confdefs.h" #include <X11/$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9343: \"$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* ＠＠ -9286,15 +9356,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9290: checking for X11/$athena_variant/ThreeD.h" >&5 +echo "configure:9360: checking for X11/$athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9293 "configure" +#line 9363 "configure" #include "confdefs.h" #include <X11/$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9368: \"$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* ＠＠ -9322,15 +9392,15 ＠＠ fi if test -z "$athena_h_path"; then ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:9326: checking for $athena_variant/XawInit.h" >&5 +echo "configure:9396: checking for $athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9329 "configure" +#line 9399 "configure" #include "confdefs.h" #include <$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9404: \"$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* ＠＠ -9347,15 +9417,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a echo "$ac_t""yes" 1>&6 ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9351: checking for $athena_variant/ThreeD.h" >&5 +echo "configure:9421: checking for $athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9354 "configure" +#line 9424 "configure" #include "confdefs.h" #include <$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9429: \"$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* ＠＠ -9384,15 +9454,15 ＠＠ fi if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:9388: checking for X11/Xaw3d/XawInit.h" >&5 +echo "configure:9458: checking for X11/Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9391 "configure" +#line 9461 "configure" #include "confdefs.h" #include <X11/Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9466: \"$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* ＠＠ -9409,15 +9479,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9413: checking for X11/Xaw3d/ThreeD.h" >&5 +echo "configure:9483: checking for X11/Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9416 "configure" +#line 9486 "configure" #include "confdefs.h" #include <X11/Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9491: \"$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* ＠＠ -9449,15 +9519,15 ＠＠ fi if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:9453: checking for Xaw3d/XawInit.h" >&5 +echo "configure:9523: checking for Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9456 "configure" +#line 9526 "configure" #include "confdefs.h" #include <Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9531: \"$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* ＠＠ -9474,15 +9544,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a echo "$ac_t""yes" 1>&6 ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9478: checking for Xaw3d/ThreeD.h" >&5 +echo "configure:9548: checking for Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9481 "configure" +#line 9551 "configure" #include "confdefs.h" #include <Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9556: \"$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* ＠＠ -9514,15 +9584,15 ＠＠ fi if test -z "$athena_h_path"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9518: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:9588: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9521 "configure" +#line 9591 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9596: \"$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* ＠＠ -9561,15 +9631,15 ＠＠ fi if test "$with_x11" = "yes"; then ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:9565: checking for Xm/Xm.h" >&5 +echo "configure:9635: checking for Xm/Xm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9568 "configure" +#line 9638 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9643: \"$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* ＠＠ -9586,12 +9656,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:9590: checking for XmStringFree in -lXm" >&5 +echo "configure:9660: 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 9595 "configure" +#line 9665 "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 ＠＠ -9602,7 +9672,7 ＠＠ int main() { XmStringFree() ; return 0; } EOF -if { (eval echo configure:9606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9676: \"$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 ＠＠ -9631,9 +9701,9 ＠＠ fi if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:9635: checking for Lesstif" >&5 +echo "configure:9705: checking for Lesstif" >&5 cat > conftest.$ac_ext <<EOF -#line 9637 "configure" +#line 9707 "configure" #include "confdefs.h" #include <Xm/Xm.h> #ifdef LESSTIF_VERSION ＠＠ -10079,7 +10149,7 ＠＠ fi if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:10083: checking for Mule-related features" >&5 +echo "configure:10153: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF ＠＠ -10104,15 +10174,15 ＠＠ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10108: checking for $ac_hdr" >&5 +echo "configure:10178: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 10111 "configure" +#line 10181 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10186: \"$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* ＠＠ -10143,12 +10213,12 ＠＠ done echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:10147: checking for strerror in -lintl" >&5 +echo "configure:10217: 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 10152 "configure" +#line 10222 "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 ＠＠ -10159,7 +10229,7 ＠＠ int main() { strerror() ; return 0; } EOF -if { (eval echo configure:10163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10233: \"$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 ＠＠ -10192,18 +10262,18 ＠＠ fi echo "checking for Mule input methods" 1>&6 -echo "configure:10196: checking for Mule input methods" >&5 +echo "configure:10266: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:10199: checking for XIM" >&5 +echo "configure:10269: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:10202: checking for XOpenIM in -lX11" >&5 +echo "configure:10272: 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 10207 "configure" +#line 10277 "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 ＠＠ -10214,7 +10284,7 ＠＠ int main() { XOpenIM() ; return 0; } EOF -if { (eval echo configure:10218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10288: \"$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 ＠＠ -10238,12 +10308,12 ＠＠ fi if test "$need_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:10242: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:10312: 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 10247 "configure" +#line 10317 "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 ＠＠ -10254,7 +10324,7 ＠＠ int main() { XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:10258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10328: \"$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 ＠＠ -10277,12 +10347,12 ＠＠ fi elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:10281: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:10351: 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 10286 "configure" +#line 10356 "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 ＠＠ -10293,7 +10363,7 ＠＠ int main() { XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:10297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10367: \"$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 ＠＠ -10358,15 +10428,15 ＠＠ EOF if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:10362: checking for XFontSet" >&5 +echo "configure:10432: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:10365: checking for XmbDrawString in -lX11" >&5 +echo "configure:10435: 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 10370 "configure" +#line 10440 "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 ＠＠ -10377,7 +10447,7 ＠＠ int main() { XmbDrawString() ; return 0; } EOF -if { (eval echo configure:10381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10451: \"$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 ＠＠ -10417,15 +10487,15 ＠＠ EOF 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:10421: checking for wnn/jllib.h" >&5 +echo "configure:10491: checking for wnn/jllib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10424 "configure" +#line 10494 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10499: \"$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* ＠＠ -10448,15 +10518,15 ＠＠ fi } 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:10452: checking for wnn/commonhd.h" >&5 +echo "configure:10522: checking for wnn/commonhd.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10455 "configure" +#line 10525 "configure" #include "confdefs.h" #include <wnn/commonhd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10530: \"$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* ＠＠ -10481,10 +10551,10 ＠＠ fi for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10485: checking for $ac_func" >&5 +echo "configure:10555: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 10488 "configure" +#line 10558 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -10507,7 +10577,7 ＠＠ $ac_func(); ; return 0; } EOF -if { (eval echo configure:10511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10581: \"$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 ＠＠ -10536,12 +10606,12 ＠＠ done test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:10540: checking for crypt in -lcrypt" >&5 +echo "configure:10610: 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 10545 "configure" +#line 10615 "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 ＠＠ -10552,7 +10622,7 ＠＠ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:10556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10626: \"$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 ＠＠ -10587,12 +10657,12 ＠＠ fi 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:10591: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:10661: 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 10596 "configure" +#line 10666 "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 ＠＠ -10603,7 +10673,7 ＠＠ int main() { jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10677: \"$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 ＠＠ -10621,12 +10691,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:10625: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:10695: 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 10630 "configure" +#line 10700 "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 ＠＠ -10637,7 +10707,7 ＠＠ int main() { jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10711: \"$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 ＠＠ -10655,12 +10725,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:10659: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:10729: 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 10664 "configure" +#line 10734 "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 ＠＠ -10671,7 +10741,7 ＠＠ int main() { jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10745: \"$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 ＠＠ -10689,12 +10759,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:10693: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:10763: 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 10698 "configure" +#line 10768 "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 ＠＠ -10705,7 +10775,7 ＠＠ int main() { dic_list_e() ; return 0; } EOF -if { (eval echo configure:10709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10779: \"$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 ＠＠ -10753,12 +10823,12 ＠＠ EOF if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:10757: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:10827: 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 10762 "configure" +#line 10832 "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 ＠＠ -10769,7 +10839,7 ＠＠ int main() { jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:10773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10843: \"$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 ＠＠ -10804,15 +10874,15 ＠＠ EOF 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:10808: checking for canna/jrkanji.h" >&5 +echo "configure:10878: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10811 "configure" +#line 10881 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10886: \"$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* ＠＠ -10839,15 +10909,15 ＠＠ fi 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:10843: checking for canna/jrkanji.h" >&5 +echo "configure:10913: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10846 "configure" +#line 10916 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10921: \"$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* ＠＠ -10875,15 +10945,15 ＠＠ 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:10879: checking for canna/RK.h" >&5 +echo "configure:10949: checking for canna/RK.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10882 "configure" +#line 10952 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10957: \"$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* ＠＠ -10906,12 +10976,12 ＠＠ fi } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:10910: checking for RkBgnBun in -lRKC" >&5 +echo "configure:10980: 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 10915 "configure" +#line 10985 "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 ＠＠ -10922,7 +10992,7 ＠＠ int main() { RkBgnBun() ; return 0; } EOF -if { (eval echo configure:10926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10996: \"$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 ＠＠ -10945,12 +11015,12 ＠＠ fi } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:10949: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:11019: 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 10954 "configure" +#line 11024 "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 ＠＠ -10961,7 +11031,7 ＠＠ int main() { jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:10965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11035: \"$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 ＠＠ -11010,12 +11080,12 ＠＠ if test "$need_motif" = "yes" ; then 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:11014: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:11084: 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 11019 "configure" +#line 11089 "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 ＠＠ -11026,7 +11096,7 ＠＠ int main() { layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:11030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11100: \"$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 ＠＠ -11113,10 +11183,10 ＠＠ fi 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:11117: checking for $ac_func" >&5 +echo "configure:11187: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 11120 "configure" +#line 11190 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11139,7 +11209,7 ＠＠ $ac_func(); ; return 0; } EOF -if { (eval echo configure:11143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11213: \"$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 ＠＠ -11180,10 +11250,10 ＠＠ fi 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:11184: checking for $ac_func" >&5 +echo "configure:11254: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 11187 "configure" +#line 11257 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11206,7 +11276,7 ＠＠ $ac_func(); ; return 0; } EOF -if { (eval echo configure:11210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11280: \"$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 ＠＠ -11235,10 +11305,10 ＠＠ done echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:11239: checking for openpty" >&5 +echo "configure:11309: checking for openpty" >&5 cat > conftest.$ac_ext <<EOF -#line 11242 "configure" +#line 11312 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char openpty(); below. */ ＠＠ -11261,7 +11331,7 ＠＠ openpty(); ; return 0; } EOF -if { (eval echo configure:11265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11335: \"$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 ＠＠ -11280,12 +11350,12 ＠＠ else echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:11284: checking for openpty in -lutil" >&5 +echo "configure:11354: 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 11289 "configure" +#line 11359 "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 ＠＠ -11296,7 +11366,7 ＠＠ int main() { openpty() ; return 0; } EOF -if { (eval echo configure:11300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11370: \"$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 ＠＠ -11331,15 +11401,15 ＠＠ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11335: checking for $ac_hdr" >&5 +echo "configure:11405: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 11338 "configure" +#line 11408 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11413: \"$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* ＠＠ -11375,15 +11445,15 ＠＠ for ac_hdr in stropts.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11379: checking for $ac_hdr" >&5 +echo "configure:11449: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 11382 "configure" +#line 11452 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11457: \"$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* ＠＠ -11416,10 +11486,10 ＠＠ if test "$ac_cv_header_stropts_h" = "yes for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11420: checking for $ac_func" >&5 +echo "configure:11490: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 11423 "configure" +#line 11493 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11442,7 +11512,7 ＠＠ $ac_func(); ; return 0; } EOF -if { (eval echo configure:11446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11516: \"$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 ＠＠ -11473,15 +11543,15 ＠＠ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11477: checking for $ac_hdr" >&5 +echo "configure:11547: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 11480 "configure" +#line 11550 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11555: \"$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* ＠＠ -11518,10 +11588,10 ＠＠ extra_objs="$extra_objs realpath.o" && for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11522: checking for $ac_func" >&5 +echo "configure:11592: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 11525 "configure" +#line 11595 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11544,7 +11614,7 ＠＠ $ac_func(); ; return 0; } EOF -if { (eval echo configure:11548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11618: \"$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 ＠＠ -11577,15 +11647,15 ＠＠ if test "$ac_cv_func_getloadavg" = "yes" do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11581: checking for $ac_hdr" >&5 +echo "configure:11651: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 11584 "configure" +#line 11654 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11659: \"$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* ＠＠ -11621,12 +11691,12 ＠＠ else echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:11625: checking for kstat_open in -lkstat" >&5 +echo "configure:11695: 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 11630 "configure" +#line 11700 "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 ＠＠ -11637,7 +11707,7 ＠＠ int main() { kstat_open() ; return 0; } EOF -if { (eval echo configure:11641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11711: \"$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 ＠＠ -11672,15 +11742,15 ＠＠ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11676: checking for $ac_hdr" >&5 +echo "configure:11746: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 11679 "configure" +#line 11749 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11754: \"$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* ＠＠ -11712,12 +11782,12 ＠＠ done echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:11716: checking for kvm_read in -lkvm" >&5 +echo "configure:11786: 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 11721 "configure" +#line 11791 "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 ＠＠ -11728,7 +11798,7 ＠＠ int main() { kvm_read() ; return 0; } EOF -if { (eval echo configure:11732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11802: \"$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 ＠＠ -11762,16 +11832,16 ＠＠ fi fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:11766: checking whether netdb declares h_errno" >&5 +echo "configure:11836: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext <<EOF -#line 11768 "configure" +#line 11838 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:11775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11845: \"$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 ＠＠ -11791,16 +11861,16 ＠＠ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:11795: checking for sigsetjmp" >&5 +echo "configure:11865: checking for sigsetjmp" >&5 cat > conftest.$ac_ext <<EOF -#line 11797 "configure" +#line 11867 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:11804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11874: \"$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 ＠＠ -11820,11 +11890,11 ＠＠ fi rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:11824: checking whether localtime caches TZ" >&5 +echo "configure:11894: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 11828 "configure" +#line 11898 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS ＠＠ -11859,7 +11929,7 ＠＠ main() exit (0); } EOF -if { (eval echo configure:11863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else ＠＠ -11889,9 +11959,9 ＠＠ fi if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:11893: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:11963: checking whether gettimeofday accepts one or two arguments" >&5 cat > conftest.$ac_ext <<EOF -#line 11895 "configure" +#line 11965 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME ＠＠ -11912,7 +11982,7 ＠＠ int main() { ; return 0; } EOF -if { (eval echo configure:11916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11986: \"$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 ＠＠ -11934,19 +12004,19 ＠＠ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:11938: checking for inline" >&5 +echo "configure:12008: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 11943 "configure" +#line 12013 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:11950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else ＠＠ -11987,17 +12057,17 ＠＠ if test "$__DECC" != "yes"; then # 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:11991: checking for working alloca.h" >&5 +echo "configure:12061: checking for working alloca.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11994 "configure" +#line 12064 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:12001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12071: \"$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 ＠＠ -12021,10 +12091,10 ＠＠ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:12025: checking for alloca" >&5 +echo "configure:12095: checking for alloca" >&5 cat > conftest.$ac_ext <<EOF -#line 12028 "configure" +#line 12098 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -12052,7 +12122,7 ＠＠ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:12056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12126: \"$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 ＠＠ -12091,10 +12161,10 ＠＠ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:12095: checking whether alloca needs Cray hooks" >&5 +echo "configure:12165: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <<EOF -#line 12098 "configure" +#line 12168 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray ＠＠ -12118,10 +12188,10 ＠＠ echo "$ac_t""$ac_cv_os_cray" 1>&6 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:12122: checking for $ac_func" >&5 +echo "configure:12192: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12125 "configure" +#line 12195 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12144,7 +12214,7 ＠＠ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12218: \"$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 ＠＠ -12174,10 +12244,10 ＠＠ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:12178: checking stack direction for C alloca" >&5 +echo "configure:12248: checking stack direction for C alloca" >&5 cat > conftest.$ac_ext <<EOF -#line 12181 "configure" +#line 12251 "configure" #include "confdefs.h" find_stack_direction () { ＠＠ -12196,7 +12266,7 ＠＠ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:12200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else ＠＠ -12226,15 +12296,15 ＠＠ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:12230: checking for vfork.h" >&5 +echo "configure:12300: checking for vfork.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12233 "configure" +#line 12303 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12308: \"$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* ＠＠ -12262,10 +12332,10 ＠＠ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:12266: checking for working vfork" >&5 +echo "configure:12336: checking for working vfork" >&5 cat > conftest.$ac_ext <<EOF -#line 12269 "configure" +#line 12339 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> ＠＠ -12360,7 +12430,7 ＠＠ main() { } } EOF -if { (eval echo configure:12364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_vfork_works=yes else ＠＠ -12386,10 +12456,10 ＠＠ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:12390: checking for working strcoll" >&5 +echo "configure:12460: checking for working strcoll" >&5 cat > conftest.$ac_ext <<EOF -#line 12393 "configure" +#line 12463 "configure" #include "confdefs.h" #include <string.h> main () ＠＠ -12399,7 +12469,7 ＠＠ main () strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:12403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else ＠＠ -12427,10 +12497,10 ＠＠ fi for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12431: checking for $ac_func" >&5 +echo "configure:12501: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12434 "configure" +#line 12504 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12453,7 +12523,7 ＠＠ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12527: \"$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 ＠＠ -12481,10 +12551,10 ＠＠ fi done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:12485: checking whether getpgrp takes no argument" >&5 +echo "configure:12555: checking whether getpgrp takes no argument" >&5 cat > conftest.$ac_ext <<EOF -#line 12488 "configure" +#line 12558 "configure" #include "confdefs.h" /* ＠＠ -12539,7 +12609,7 ＠＠ main() } EOF -if { (eval echo configure:12543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else ＠＠ -12566,10 +12636,10 ＠＠ fi echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:12570: checking for working mmap" >&5 +echo "configure:12640: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 12573 "configure" +#line 12643 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> ＠＠ -12602,7 +12672,7 ＠＠ int main (int argc, char *argv[]) return 1; } EOF -if { (eval echo configure:12606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else ＠＠ -12631,9 +12701,9 ＠＠ test "$GNU_MALLOC" != "yes" -a "$have_mm 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:12635: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:12705: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 12637 "configure" +#line 12707 "configure" #include "confdefs.h" #include <malloc.h> int main() { ＠＠ -12645,7 +12715,7 ＠＠ int main() { ; return 0; } EOF -if { (eval echo configure:12649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else ＠＠ -12670,15 +12740,15 ＠＠ EOF ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:12674: checking for termios.h" >&5 +echo "configure:12744: checking for termios.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12677 "configure" +#line 12747 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12752: \"$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* ＠＠ -12721,15 +12791,15 ＠＠ else 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:12725: checking for termio.h" >&5 +echo "configure:12795: checking for termio.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12728 "configure" +#line 12798 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12803: \"$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* ＠＠ -12761,10 +12831,10 ＠＠ fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:12765: checking for socket" >&5 +echo "configure:12835: checking for socket" >&5 cat > conftest.$ac_ext <<EOF -#line 12768 "configure" +#line 12838 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ ＠＠ -12787,7 +12857,7 ＠＠ socket(); ; return 0; } EOF -if { (eval echo configure:12791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12861: \"$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 ＠＠ -12802,15 +12872,15 ＠＠ if eval "test \"`echo '$ac_cv_func_'sock 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:12806: checking for netinet/in.h" >&5 +echo "configure:12876: checking for netinet/in.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12809 "configure" +#line 12879 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12884: \"$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* ＠＠ -12827,15 +12897,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a 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:12831: checking for arpa/inet.h" >&5 +echo "configure:12901: checking for arpa/inet.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12834 "configure" +#line 12904 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12909: \"$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* ＠＠ -12860,9 +12930,9 ＠＠ EOF } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:12864: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:12934: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 12866 "configure" +#line 12936 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -12873,7 +12943,7 ＠＠ int main() { static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:12877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12947: \"$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 ＠＠ -12891,9 +12961,9 ＠＠ else fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:12895: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:12965: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 12897 "configure" +#line 12967 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -12903,7 +12973,7 ＠＠ int main() { static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:12907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12977: \"$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 ＠＠ -12934,10 +13004,10 ＠＠ fi echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:12938: checking for msgget" >&5 +echo "configure:13008: checking for msgget" >&5 cat > conftest.$ac_ext <<EOF -#line 12941 "configure" +#line 13011 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ ＠＠ -12960,7 +13030,7 ＠＠ msgget(); ; return 0; } EOF -if { (eval echo configure:12964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13034: \"$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 ＠＠ -12975,15 +13045,15 ＠＠ if eval "test \"`echo '$ac_cv_func_'msgg 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:12979: checking for sys/ipc.h" >&5 +echo "configure:13049: checking for sys/ipc.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12982 "configure" +#line 13052 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13057: \"$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* ＠＠ -13000,15 +13070,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a 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:13004: checking for sys/msg.h" >&5 +echo "configure:13074: checking for sys/msg.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13007 "configure" +#line 13077 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13082: \"$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* ＠＠ -13046,15 +13116,15 ＠＠ fi ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:13050: checking for dirent.h" >&5 +echo "configure:13120: checking for dirent.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13053 "configure" +#line 13123 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13128: \"$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* ＠＠ -13081,15 +13151,15 ＠＠ else 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:13085: checking for sys/dir.h" >&5 +echo "configure:13155: checking for sys/dir.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13088 "configure" +#line 13158 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13163: \"$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* ＠＠ -13122,15 +13192,15 ＠＠ fi ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:13126: checking for nlist.h" >&5 +echo "configure:13196: checking for nlist.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13129 "configure" +#line 13199 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13204: \"$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* ＠＠ -13160,22 +13230,22 ＠＠ fi echo "checking "for sound support"" 1>&6 -echo "configure:13164: checking "for sound support"" >&5 +echo "configure:13234: 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:13171: checking for multimedia/audio_device.h" >&5 +echo "configure:13241: checking for multimedia/audio_device.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13174 "configure" +#line 13244 "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:13179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13249: \"$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* ＠＠ -13231,12 +13301,12 ＠＠ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:13235: checking for ALopenport in -laudio" >&5 +echo "configure:13305: 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 13240 "configure" +#line 13310 "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 ＠＠ -13247,7 +13317,7 ＠＠ int main() { ALopenport() ; return 0; } EOF -if { (eval echo configure:13251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13321: \"$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 ＠＠ -13278,12 +13348,12 ＠＠ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:13282: checking for AOpenAudio in -lAlib" >&5 +echo "configure:13352: 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 13287 "configure" +#line 13357 "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 ＠＠ -13294,7 +13364,7 ＠＠ int main() { AOpenAudio() ; return 0; } EOF -if { (eval echo configure:13298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13368: \"$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 ＠＠ -13339,15 +13409,15 ＠＠ fi 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:13343: checking for ${dir}/soundcard.h" >&5 +echo "configure:13413: checking for ${dir}/soundcard.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13346 "configure" +#line 13416 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13421: \"$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* ＠＠ -13401,15 +13471,15 ＠＠ fi 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:13405: checking for audio/audiolib.h" >&5 +echo "configure:13475: checking for audio/audiolib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13408 "configure" +#line 13478 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13483: \"$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* ＠＠ -13427,12 +13497,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:13431: checking for AuOpenServer in -laudio" >&5 +echo "configure:13501: 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 13436 "configure" +#line 13506 "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 ＠＠ -13443,7 +13513,7 ＠＠ int main() { AuOpenServer() ; return 0; } EOF -if { (eval echo configure:13447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13517: \"$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 ＠＠ -13482,7 +13552,7 ＠＠ EOF 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 13486 "configure" +#line 13556 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF ＠＠ -13513,7 +13583,7 ＠＠ if test "$with_esd_sound" != "no"; then # 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:13517: checking for $ac_word" >&5 +echo "configure:13587: 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. ＠＠ -13542,10 +13612,10 ＠＠ fi 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:13546: checking for esd_play_stream" >&5 +echo "configure:13616: checking for esd_play_stream" >&5 cat > conftest.$ac_ext <<EOF -#line 13549 "configure" +#line 13619 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ ＠＠ -13568,7 +13638,7 ＠＠ esd_play_stream(); ; return 0; } EOF -if { (eval echo configure:13572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13642: \"$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 ＠＠ -13619,7 +13689,7 ＠＠ test -z "$with_tty" && with_tty=yes if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:13623: checking for TTY-related features" >&5 +echo "configure:13693: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF ＠＠ -13635,12 +13705,12 ＠＠ EOF if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:13639: checking for tgetent in -lncurses" >&5 +echo "configure:13709: 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 13644 "configure" +#line 13714 "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 ＠＠ -13651,7 +13721,7 ＠＠ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:13655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13725: \"$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 ＠＠ -13684,15 +13754,15 ＠＠ EOF ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:13688: checking for ncurses/curses.h" >&5 +echo "configure:13758: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13691 "configure" +#line 13761 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13766: \"$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* ＠＠ -13714,15 +13784,15 ＠＠ fi ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:13718: checking for ncurses/term.h" >&5 +echo "configure:13788: checking for ncurses/term.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13721 "configure" +#line 13791 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13796: \"$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* ＠＠ -13752,15 +13822,15 ＠＠ fi 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:13756: checking for ncurses/curses.h" >&5 +echo "configure:13826: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13759 "configure" +#line 13829 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13834: \"$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* ＠＠ -13795,12 +13865,12 ＠＠ fi for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:13799: checking for tgetent in -l$lib" >&5 +echo "configure:13869: 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 13804 "configure" +#line 13874 "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 ＠＠ -13811,7 +13881,7 ＠＠ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:13815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13885: \"$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 ＠＠ -13836,12 +13906,12 ＠＠ fi else if test -n "$libs_termcap" -a "$opsys" = "openbsd"; then echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:13840: checking for tgoto in -ltermcap" >&5 +echo "configure:13910: 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 13845 "configure" +#line 13915 "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 ＠＠ -13852,7 +13922,7 ＠＠ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:13856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13926: \"$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 ＠＠ -13897,12 +13967,12 ＠＠ fi else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:13901: checking for tgetent in -lcurses" >&5 +echo "configure:13971: 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 13906 "configure" +#line 13976 "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 ＠＠ -13913,7 +13983,7 ＠＠ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:13917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13987: \"$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 ＠＠ -13931,12 +14001,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:13935: checking for tgetent in -ltermcap" >&5 +echo "configure:14005: 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 13940 "configure" +#line 14010 "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 ＠＠ -13947,7 +14017,7 ＠＠ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:13951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14021: \"$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 ＠＠ -13996,15 +14066,15 ＠＠ EOF if test "$with_gpm" != "no"; then ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:14000: checking for gpm.h" >&5 +echo "configure:14070: checking for gpm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14003 "configure" +#line 14073 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14078: \"$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* ＠＠ -14022,12 +14092,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:14026: checking for Gpm_Open in -lgpm" >&5 +echo "configure:14096: 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 14031 "configure" +#line 14101 "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 ＠＠ -14038,7 +14108,7 ＠＠ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:14042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14112: \"$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 ＠＠ -14097,20 +14167,20 ＠＠ test "$with_x11" = "yes" -o "$with_tty" test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:14101: checking for database support" >&5 +echo "configure:14171: 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:14106: checking for ndbm.h" >&5 +echo "configure:14176: checking for ndbm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14109 "configure" +#line 14179 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14184: \"$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* ＠＠ -14140,12 +14210,12 ＠＠ fi if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:14144: checking for dbm_open in -lgdbm" >&5 +echo "configure:14214: 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 14149 "configure" +#line 14219 "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 ＠＠ -14156,7 +14226,7 ＠＠ int main() { dbm_open() ; return 0; } EOF -if { (eval echo configure:14160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14230: \"$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 ＠＠ -14184,10 +14254,10 ＠＠ fi if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:14188: checking for dbm_open" >&5 +echo "configure:14258: checking for dbm_open" >&5 cat > conftest.$ac_ext <<EOF -#line 14191 "configure" +#line 14261 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ ＠＠ -14210,7 +14280,7 ＠＠ dbm_open(); ; return 0; } EOF -if { (eval echo configure:14214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14284: \"$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 ＠＠ -14229,12 +14299,12 ＠＠ else echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:14233: checking for dbm_open in -ldbm" >&5 +echo "configure:14303: 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 14238 "configure" +#line 14308 "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 ＠＠ -14245,7 +14315,7 ＠＠ int main() { dbm_open() ; return 0; } EOF -if { (eval echo configure:14249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14319: \"$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 ＠＠ -14285,10 +14355,10 ＠＠ EOF echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6 -echo "configure:14289: checking for u_int8_t" >&5 +echo "configure:14359: checking for u_int8_t" >&5 cat > conftest.$ac_ext <<EOF -#line 14292 "configure" +#line 14362 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -14329,10 +14399,10 ＠＠ EOF fi echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6 -echo "configure:14333: checking for u_int16_t" >&5 +echo "configure:14403: checking for u_int16_t" >&5 cat > conftest.$ac_ext <<EOF -#line 14336 "configure" +#line 14406 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -14373,10 +14443,10 ＠＠ EOF fi echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 -echo "configure:14377: checking for u_int32_t" >&5 +echo "configure:14447: checking for u_int32_t" >&5 cat > conftest.$ac_ext <<EOF -#line 14380 "configure" +#line 14450 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -14417,10 +14487,10 ＠＠ EOF fi echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6 -echo "configure:14421: checking for u_int64_t" >&5 +echo "configure:14491: checking for u_int64_t" >&5 cat > conftest.$ac_ext <<EOF -#line 14424 "configure" +#line 14494 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -14463,12 +14533,12 ＠＠ fi if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:14467: checking for Berkeley db.h" >&5 +echo "configure:14537: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do case "$opsys" in *freebsd*) cat > conftest.$ac_ext <<EOF -#line 14472 "configure" +#line 14542 "configure" #include "confdefs.h" #include <stdlib.h> ＠＠ -14484,7 +14554,7 ＠＠ int main() { ; return 0; } EOF -if { (eval echo configure:14488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else ＠＠ -14495,7 +14565,7 ＠＠ rm -f conftest* ;; *) cat > conftest.$ac_ext <<EOF -#line 14499 "configure" +#line 14569 "configure" #include "confdefs.h" #include <stdlib.h> ＠＠ -14525,7 +14595,7 ＠＠ int main() { ; return 0; } EOF -if { (eval echo configure:14529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else ＠＠ -14543,9 +14613,9 ＠＠ rm -f conftest* if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:14547: checking for Berkeley DB version" >&5 +echo "configure:14617: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 14549 "configure" +#line 14619 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 ＠＠ -14557,7 +14627,7 ＠＠ if (eval "$ac_cpp conftest.$ac_ext") 2>& egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 14561 "configure" +#line 14631 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 ＠＠ -14584,10 +14654,10 ＠＠ fi rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:14588: checking for $dbfunc" >&5 +echo "configure:14658: checking for $dbfunc" >&5 cat > conftest.$ac_ext <<EOF -#line 14591 "configure" +#line 14661 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ ＠＠ -14610,7 +14680,7 ＠＠ $dbfunc(); ; return 0; } EOF -if { (eval echo configure:14614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14684: \"$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 ＠＠ -14629,12 +14699,12 ＠＠ else echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:14633: checking for $dbfunc in -ldb" >&5 +echo "configure:14703: 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 14638 "configure" +#line 14708 "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 ＠＠ -14645,7 +14715,7 ＠＠ int main() { $dbfunc() ; return 0; } EOF -if { (eval echo configure:14649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14719: \"$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 ＠＠ -14709,12 +14779,12 ＠＠ fi if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:14713: checking for SOCKSinit in -lsocks" >&5 +echo "configure:14783: 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 14718 "configure" +#line 14788 "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 ＠＠ -14725,7 +14795,7 ＠＠ int main() { SOCKSinit() ; return 0; } EOF -if { (eval echo configure:14729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14799: \"$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 ＠＠ -14780,7 +14850,7 ＠＠ fi if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:14784: checking for module support" >&5 +echo "configure:14854: checking for module support" >&5 if test "$with_msw" = "yes"; then have_dl=yes; ＠＠ -14796,15 +14866,15 ＠＠ EOF ;; *) ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:14800: checking for dlfcn.h" >&5 +echo "configure:14870: checking for dlfcn.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14803 "configure" +#line 14873 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14878: \"$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* ＠＠ -14821,16 +14891,16 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:14825: checking for dlopen in -lc" >&5 +echo "configure:14895: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 14827 "configure" +#line 14897 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -14839,18 +14909,18 ＠＠ else rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:14843: checking for dlopen in -ldl" >&5 +echo "configure:14913: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 14847 "configure" +#line 14917 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -14879,12 +14949,12 ＠＠ EOF else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:14883: checking for shl_load in -ldld" >&5 +echo "configure:14953: 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 14888 "configure" +#line 14958 "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 ＠＠ -14895,7 +14965,7 ＠＠ int main() { shl_load() ; return 0; } EOF -if { (eval echo configure:14899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14969: \"$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 ＠＠ -14922,12 +14992,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:14926: checking for dld_init in -ldld" >&5 +echo "configure:14996: 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 14931 "configure" +#line 15001 "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 ＠＠ -14938,7 +15008,7 ＠＠ int main() { dld_init() ; return 0; } EOF -if { (eval echo configure:14942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15012: \"$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 ＠＠ -14985,7 +15055,7 ＠＠ xehost=$canonical xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:14989: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:15059: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; ＠＠ -15013,9 +15083,9 ＠＠ if test "$GCC" = "yes"; then XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:15017: checking checking whether we are using GNU C" >&5 +echo "configure:15087: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 15019 "configure" +#line 15089 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -15037,7 +15107,7 ＠＠ rm -f conftest* fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:15041: checking how to produce PIC code" >&5 +echo "configure:15111: checking how to produce PIC code" >&5 wl= can_build_shared=yes ＠＠ -15138,18 +15208,18 ＠＠ if test -n "$dll_cflags"; then # 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:15142: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:15212: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 15146 "configure" +#line 15216 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:15153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15223: \"$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 ＠＠ -15180,7 +15250,7 ＠＠ cc_produces_so=no xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:15184: checking if C compiler can produce shared libraries" >&5 +echo "configure:15254: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes -o "$__ICC" = yes; then xcldf="-shared" xldf="-shared" ＠＠ -15231,14 +15301,14 ＠＠ if test -n "$xcldf"; then 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 15235 "configure" +#line 15305 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:15242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else ＠＠ -15263,7 +15333,7 ＠＠ if test -z "$LTLD"; then 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:15267: checking for ld used by GCC" >&5 +echo "configure:15337: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. ＠＠ -15289,7 +15359,7 ＠＠ echo "configure:15267: checking for ld u esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:15293: checking for GNU ld" >&5 +echo "configure:15363: checking for GNU ld" >&5 fi if test -z "$LTLD"; then ＠＠ -15327,7 +15397,7 ＠＠ ld_dynamic_link_flags= # 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:15331: checking if the linker is GNU ld" >&5 +echo "configure:15401: 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 ＠＠ -15355,7 +15425,7 ＠＠ else # 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:15359: checking whether the linker supports shared libraries" >&5 +echo "configure:15429: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes ＠＠ -15566,10 +15636,10 ＠＠ EOF for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15570: checking for $ac_func" >&5 +echo "configure:15640: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 15573 "configure" +#line 15643 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -15592,7 +15662,7 ＠＠ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15666: \"$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 ＠＠ -15631,11 +15701,11 ＠＠ done fi cat > conftest.$ac_ext <<EOF -#line 15635 "configure" +#line 15705 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:15639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else 1.151.2.35 +53 -23 XEmacs/xemacs/configure.in Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.151.2.34 retrieving revision 1.151.2.35 diff -u -p -r1.151.2.34 -r1.151.2.35 --- configure.in 2005/11/28 02:09:20 1.151.2.34 +++ configure.in 2005/11/30 23:58:31 1.151.2.35 ＠＠ -3206,33 +3206,63 ＠＠ dnl Autodetect LDAP AC_CHECKING(for LDAP) test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) } test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) } -if test "$with_ldap" != "no"; then - AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes) - dnl Check for other libraries we need to link with to get the main routines. - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) } - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) } - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) } - dnl Recently, we need -lber even though the main routines are elsewhere, - dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on. So just - dnl check for that (it's a variable not a fun but that doesn't seem to - dnl matter in these checks) and stick in -lber if so. Can't hurt (even to - dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who - dnl #### understands LDAP needs to fix this properly. - test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) } +if test no != "$with_ldap";then + if test . != "${ldap_libs+.}";then + ldap_libs= + AC_CHECK_FUNC(ldap_open,dnl Allow it to be in generic "$LIBS" + [with_ldap=yes + test yes = "$extra_verbose" && + echo "Setting ldap_libs to $ldap_libs"],dnl + [AC_CHECK_LIB(ldap, ldap_open,dnl + [with_ldap=yes],dnl + [ldap_needs_lber=yes ldap_other_libs=-llber +dnl This requires `AC_CACHE_VAL' (which is called by `AC_CHECK_LIB') +dnl to be redefined to ignore cached (shell variable) value, as it is +dnl done above, because the same variable is used in all +dnl `AC_CHECK_LIB' expansions in macro invocation below. Worse, if it +dnl is not done, there is no portable way to compensate for this +dnl locally since `unset' command is not supported by all shells. The +dnl other solution would be changing `AC_CHECK_LIB' so that cache +dnl variable name depends on the macro OTHER-LIBRARIES argument. + AC_CHECK_LIB(ldap, ldap_open,dnl + [with_ldap=yes],dnl + [ldap_needs_krb=yes ldap_other_libs="$ldap_other_libs -lkrb" + AC_CHECK_LIB(ldap, ldap_open,dnl + [with_ldap=yes],dnl + [ldap_needs_des=yes ldap_other_libs="$ldap_other_libs -ldes" + AC_CHECK_LIB(ldap, ldap_open,dnl + [with_ldap=yes],dnl + [with_ldap=no],dnl + $ldap_other_libs)],dnl + $ldap_other_libs)],dnl + $ldap_other_libs)]) + if test yes = "$with_ldap";then + if test yes = "$ldap_needs_des";then + XE_PREPEND(-ldes, ldap_libs) + fi + if test yes = "$ldap_needs_krb";then + XE_PREPEND(-lkrb, ldap_libs) + fi + if test yes = "$ldap_needs_lber";then + XE_PREPEND(-llber, ldap_libs) + fi + XE_PREPEND(-lldap, ldap_libs) + fi]) + else +dnl Allow builder to override "$ldap_libs". + save_LIBS="$LIBS" LIBS="$ldap_libs $LIBS" + AC_CHECK_FUNC(ldap_open,dnl + [with_ldap=yes + test yes = "$extra_verbose" && + echo "Setting ldap_libs to $ldap_libs"],dnl + [with_ldap=no]) + LIBS="$save_LIBS" + fi fi if test "$with_ldap" = "yes"; then AC_DEFINE(HAVE_LDAP) XE_ADD_OBJS(eldap.o) - if test "$with_ldap_des" = "yes" ; then - XE_PREPEND(-ldes, LIBS) - fi - if test "$with_ldap_krb" = "yes" ; then - XE_PREPEND(-lkrb, LIBS) - fi - if test "$with_ldap_lber" = "yes" ; then - XE_PREPEND(-llber, LIBS) - fi - XE_PREPEND(-lldap, LIBS) + LIBS="$ldap_libs $LIBS" AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result) fi 1.69.2.5 +6 -0 XEmacs/xemacs/etc/NEWS Index: NEWS =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/NEWS,v retrieving revision 1.69.2.4 retrieving revision 1.69.2.5 diff -u -p -r1.69.2.4 -r1.69.2.5 --- NEWS 2004/07/07 02:25:46 1.69.2.4 +++ NEWS 2005/11/30 23:59:18 1.69.2.5 ＠＠ -117,6 +117,7 ＠＠ consulted for a more detailed list of ch - In Perl, the --globals option tags global variables. - Python now supported. - New file extensions recognized: .ss, .pdb, .psw. + -- Fixed ldap libraries configuration. ** The delete key now deletes forward by default. ＠＠ -598,6 +599,11 ＠＠ def and class at the beginning of a line *** New file extensions recognized: .ss, .pdb, .psw. .ss files are Scheme files, .pdb is Postscript with C syntax, .psw is for PSWrap. + +** Fixed ldap libraries configuration. + +It used to fail when `-lldap' requires `-llber'. Introduced in +upstream `configure.in' revision 1.151.2.31 (2005/01/31 02:54:47 +0).  * Lisp and internal changes in XEmacs 21.4