Mercurial > hg > xemacs-beta
diff configure @ 5843:69f9e31c9ccf
Fix progress bar crashes.
Thanks to Ralf Soergel for diagnosis and the configure test.
2015-01-08 Stephen J. Turnbull <stephen@xemacs.org>
* config.h.in (HAVE_ATHENA_I18N): New #define.
* lwlib/xt-wrappers.h (HAVE_ATHENA_I18N):
Define XAW_INTERNATIONALIZATION when needed.
* configure.ac (Athena widgets):
Test for international resource in SimpleWidgetClass in libXaw3d.
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Sat, 10 Jan 2015 17:11:19 +0900 |
parents | b8316d3409cd |
children | 83e5c3cd6be6 |
line wrap: on
line diff
--- a/configure Sat Jan 03 16:24:56 2015 +0100 +++ b/configure Sat Jan 10 17:11:19 2015 +0900 @@ -16802,6 +16802,52 @@ if test -n "$athena_lib" -a -n "$athena_h_path"; then have_xaw=yes + have_athena_i18n=unset + if test "$athena_variant" = "Xaw3d"; then + save_libs_x=$libs_x + libs_x="-lXaw3d $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXaw3d\" to \$libs_x"; fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"international\" resource in Xaw3d SimpleWidget" >&5 +$as_echo_n "checking for \"international\" resource in Xaw3d SimpleWidget... " >&6; } + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdlib.h> + #include <string.h> + #undef XAW_INTERNATIONALIZATION + #include <$athena_h_path/Simple.h> + +int +main () +{ +int i = simpleWidgetClass->core_class.num_resources; + while (i-- > 0) + if (!strcmp(simpleWidgetClass->core_class.resources[i].resource_name, + "international")) + exit(0); + exit(253); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + have_athena_i18n=yes +else + have_athena_i18n=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + libs_x=$save_libs_x + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_athena_i18n" >&5 +$as_echo "$have_athena_i18n" >&6; } + fi else have_xaw=no fi @@ -17006,10 +17052,13 @@ $as_echo "#define NEED_ATHENA 1" >>confdefs.h need_athena="yes" - if test "$athena_3d" = "yes"; then $as_echo "#define HAVE_ATHENA_3D 1" >>confdefs.h + if test "$have_athena_i18n" = "yes"; then + $as_echo "#define HAVE_ATHENA_I18N 1" >>confdefs.h + + fi fi ;; esac