filename | configure |
changeset | 10:c898b37506e0 |
prev | 1:eea311cfd33e |
next | 94:8d80d9c7cc7d |
author | nkeynes |
date | Thu Dec 22 13:28:16 2005 +0000 (18 years ago) |
permissions | -rw-r--r-- |
last change | Add scif.c (oops) Convert interrupts to be level-triggered rather than edge-triggered (although shouldn't be any visible difference) |
file | annotate | diff | log | raw |
1.1 --- a/configure Sat Mar 13 00:03:32 2004 +00001.2 +++ b/configure Thu Dec 22 13:28:16 2005 +00001.3 @@ -4783,7 +4783,65 @@1.4 #1.5 # First check in libc1.6 #1.7 - echo "$as_me:$LINENO: checking for dgettext in libc" >&51.8 + echo "$as_me:$LINENO: checking for ngettext in libc" >&51.9 +echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&61.10 +if test "${gt_cv_func_ngettext_libc+set}" = set; then1.11 + echo $ECHO_N "(cached) $ECHO_C" >&61.12 +else1.13 + cat >conftest.$ac_ext <<_ACEOF1.14 +/* confdefs.h. */1.15 +_ACEOF1.16 +cat confdefs.h >>conftest.$ac_ext1.17 +cat >>conftest.$ac_ext <<_ACEOF1.18 +/* end confdefs.h. */1.19 +1.20 +#include <libintl.h>1.21 +1.22 +int1.23 +main ()1.24 +{1.25 +return !ngettext ("","", 1)1.26 + ;1.27 + return 0;1.28 +}1.29 +_ACEOF1.30 +rm -f conftest.$ac_objext conftest$ac_exeext1.31 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&51.32 + (eval $ac_link) 2>conftest.er11.33 + ac_status=$?1.34 + grep -v '^ *+' conftest.er1 >conftest.err1.35 + rm -f conftest.er11.36 + cat conftest.err >&51.37 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.38 + (exit $ac_status); } &&1.39 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'1.40 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&51.41 + (eval $ac_try) 2>&51.42 + ac_status=$?1.43 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.44 + (exit $ac_status); }; } &&1.45 + { ac_try='test -s conftest$ac_exeext'1.46 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&51.47 + (eval $ac_try) 2>&51.48 + ac_status=$?1.49 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.50 + (exit $ac_status); }; }; then1.51 + gt_cv_func_ngettext_libc=yes1.52 +else1.53 + echo "$as_me: failed program was:" >&51.54 +sed 's/^/| /' conftest.$ac_ext >&51.55 +1.56 +gt_cv_func_ngettext_libc=no1.57 +fi1.58 +rm -f conftest.err conftest.$ac_objext \1.59 + conftest$ac_exeext conftest.$ac_ext1.60 +1.61 +fi1.62 +echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&51.63 +echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&61.64 +1.65 + if test "$gt_cv_func_ngettext_libc" = "yes" ; then1.66 + echo "$as_me:$LINENO: checking for dgettext in libc" >&51.67 echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&61.68 if test "${gt_cv_func_dgettext_libc+set}" = set; then1.69 echo $ECHO_N "(cached) $ECHO_C" >&61.70 @@ -4800,7 +4858,7 @@1.71 int1.72 main ()1.73 {1.74 -return (int) dgettext ("","")1.75 +return !dgettext ("","")1.76 ;1.77 return 0;1.78 }1.79 @@ -4839,8 +4897,9 @@1.80 fi1.81 echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&51.82 echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&61.83 -1.84 - if test "$gt_cv_func_dgettext_libc" = "yes" ; then1.85 + fi1.86 +1.87 + if test "$gt_cv_func_ngettext_libc" = "yes" ; then1.89 for ac_func in bind_textdomain_codeset1.90 do1.91 @@ -4948,6 +5007,7 @@1.92 # If we don't have everything we want, check in libintl1.93 #1.94 if test "$gt_cv_func_dgettext_libc" != "yes" \1.95 + || test "$gt_cv_func_ngettext_libc" != "yes" \1.96 || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then1.98 echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&51.99 @@ -5014,6 +5074,70 @@1.100 echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&51.101 echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&61.102 if test $ac_cv_lib_intl_bindtextdomain = yes; then1.103 + echo "$as_me:$LINENO: checking for ngettext in -lintl" >&51.104 +echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&61.105 +if test "${ac_cv_lib_intl_ngettext+set}" = set; then1.106 + echo $ECHO_N "(cached) $ECHO_C" >&61.107 +else1.108 + ac_check_lib_save_LIBS=$LIBS1.109 +LIBS="-lintl $LIBS"1.110 +cat >conftest.$ac_ext <<_ACEOF1.111 +/* confdefs.h. */1.112 +_ACEOF1.113 +cat confdefs.h >>conftest.$ac_ext1.114 +cat >>conftest.$ac_ext <<_ACEOF1.115 +/* end confdefs.h. */1.116 +1.117 +/* Override any gcc2 internal prototype to avoid an error. */1.118 +#ifdef __cplusplus1.119 +extern "C"1.120 +#endif1.121 +/* We use char because int might match the return type of a gcc21.122 + builtin and then its argument prototype would still apply. */1.123 +char ngettext ();1.124 +int1.125 +main ()1.126 +{1.127 +ngettext ();1.128 + ;1.129 + return 0;1.130 +}1.131 +_ACEOF1.132 +rm -f conftest.$ac_objext conftest$ac_exeext1.133 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&51.134 + (eval $ac_link) 2>conftest.er11.135 + ac_status=$?1.136 + grep -v '^ *+' conftest.er1 >conftest.err1.137 + rm -f conftest.er11.138 + cat conftest.err >&51.139 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.140 + (exit $ac_status); } &&1.141 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'1.142 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&51.143 + (eval $ac_try) 2>&51.144 + ac_status=$?1.145 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.146 + (exit $ac_status); }; } &&1.147 + { ac_try='test -s conftest$ac_exeext'1.148 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&51.149 + (eval $ac_try) 2>&51.150 + ac_status=$?1.151 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.152 + (exit $ac_status); }; }; then1.153 + ac_cv_lib_intl_ngettext=yes1.154 +else1.155 + echo "$as_me: failed program was:" >&51.156 +sed 's/^/| /' conftest.$ac_ext >&51.157 +1.158 +ac_cv_lib_intl_ngettext=no1.159 +fi1.160 +rm -f conftest.err conftest.$ac_objext \1.161 + conftest$ac_exeext conftest.$ac_ext1.162 +LIBS=$ac_check_lib_save_LIBS1.163 +fi1.164 +echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&51.165 +echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&61.166 +if test $ac_cv_lib_intl_ngettext = yes; then1.167 echo "$as_me:$LINENO: checking for dgettext in -lintl" >&51.168 echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&61.169 if test "${ac_cv_lib_intl_dgettext+set}" = set; then1.170 @@ -5083,13 +5207,79 @@1.172 fi1.174 +fi1.175 +1.177 if test "$gt_cv_func_dgettext_libintl" != "yes" ; then1.178 echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&51.179 echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&61.180 echo "$as_me:$LINENO: result: " >&51.181 echo "${ECHO_T}" >&61.182 - echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&51.183 + echo "$as_me:$LINENO: checking for ngettext in -lintl" >&51.184 +echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&61.185 +if test "${ac_cv_lib_intl_ngettext+set}" = set; then1.186 + echo $ECHO_N "(cached) $ECHO_C" >&61.187 +else1.188 + ac_check_lib_save_LIBS=$LIBS1.189 +LIBS="-lintl -liconv $LIBS"1.190 +cat >conftest.$ac_ext <<_ACEOF1.191 +/* confdefs.h. */1.192 +_ACEOF1.193 +cat confdefs.h >>conftest.$ac_ext1.194 +cat >>conftest.$ac_ext <<_ACEOF1.195 +/* end confdefs.h. */1.196 +1.197 +/* Override any gcc2 internal prototype to avoid an error. */1.198 +#ifdef __cplusplus1.199 +extern "C"1.200 +#endif1.201 +/* We use char because int might match the return type of a gcc21.202 + builtin and then its argument prototype would still apply. */1.203 +char ngettext ();1.204 +int1.205 +main ()1.206 +{1.207 +ngettext ();1.208 + ;1.209 + return 0;1.210 +}1.211 +_ACEOF1.212 +rm -f conftest.$ac_objext conftest$ac_exeext1.213 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&51.214 + (eval $ac_link) 2>conftest.er11.215 + ac_status=$?1.216 + grep -v '^ *+' conftest.er1 >conftest.err1.217 + rm -f conftest.er11.218 + cat conftest.err >&51.219 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.220 + (exit $ac_status); } &&1.221 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'1.222 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&51.223 + (eval $ac_try) 2>&51.224 + ac_status=$?1.225 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.226 + (exit $ac_status); }; } &&1.227 + { ac_try='test -s conftest$ac_exeext'1.228 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&51.229 + (eval $ac_try) 2>&51.230 + ac_status=$?1.231 + echo "$as_me:$LINENO: \$? = $ac_status" >&51.232 + (exit $ac_status); }; }; then1.233 + ac_cv_lib_intl_ngettext=yes1.234 +else1.235 + echo "$as_me: failed program was:" >&51.236 +sed 's/^/| /' conftest.$ac_ext >&51.237 +1.238 +ac_cv_lib_intl_ngettext=no1.239 +fi1.240 +rm -f conftest.err conftest.$ac_objext \1.241 + conftest$ac_exeext conftest.$ac_ext1.242 +LIBS=$ac_check_lib_save_LIBS1.243 +fi1.244 +echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&51.245 +echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&61.246 +if test $ac_cv_lib_intl_ngettext = yes; then1.247 + echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&51.248 echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&61.249 if test "${ac_cv_lib_intl_dcgettext+set}" = set; then1.250 echo $ECHO_N "(cached) $ECHO_C" >&61.251 @@ -5159,12 +5349,16 @@1.252 :1.253 fi1.255 +else1.256 + :1.257 +fi1.258 +1.259 fi1.261 #1.262 # If we found libintl, then check in it for bind_textdomain_codeset();1.263 # we'll prefer libc if neither have bind_textdomain_codeset(),1.264 - # and both have dgettext1.265 + # and both have dgettext and ngettext1.266 #1.267 if test "$gt_cv_func_dgettext_libintl" = "yes" ; then1.268 glib_save_LIBS="$LIBS"1.269 @@ -5276,7 +5470,8 @@1.270 if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then1.271 gt_cv_func_dgettext_libc=no1.272 else1.273 - if test "$gt_cv_func_dgettext_libc" = "yes"; then1.274 + if test "$gt_cv_func_dgettext_libc" = "yes" \1.275 + && test "$gt_cv_func_ngettext_libc" = "yes"; then1.276 gt_cv_func_dgettext_libintl=no1.277 fi1.278 fi
.