Search
lxdream.org :: lxdream/configure :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename configure
changeset 10:c898b37506e0
prev1:eea311cfd33e
next94:8d80d9c7cc7d
author nkeynes
date Sun Dec 11 05:15:36 2005 +0000 (14 years ago)
permissions -rw-r--r--
last change Add CPU disasembly options to mode dropdown
Split sh4/mem.c into core mem.c and sh4/mem.c
Start adding copyright comments to file headers
file annotate diff log raw
1.1 --- a/configure Sat Mar 13 00:03:32 2004 +0000
1.2 +++ b/configure Sun Dec 11 05:15:36 2005 +0000
1.3 @@ -4783,7 +4783,65 @@
1.4 #
1.5 # First check in libc
1.6 #
1.7 - echo "$as_me:$LINENO: checking for dgettext in libc" >&5
1.8 + echo "$as_me:$LINENO: checking for ngettext in libc" >&5
1.9 +echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6
1.10 +if test "${gt_cv_func_ngettext_libc+set}" = set; then
1.11 + echo $ECHO_N "(cached) $ECHO_C" >&6
1.12 +else
1.13 + cat >conftest.$ac_ext <<_ACEOF
1.14 +/* confdefs.h. */
1.15 +_ACEOF
1.16 +cat confdefs.h >>conftest.$ac_ext
1.17 +cat >>conftest.$ac_ext <<_ACEOF
1.18 +/* end confdefs.h. */
1.19 +
1.20 +#include <libintl.h>
1.21 +
1.22 +int
1.23 +main ()
1.24 +{
1.25 +return !ngettext ("","", 1)
1.26 + ;
1.27 + return 0;
1.28 +}
1.29 +_ACEOF
1.30 +rm -f conftest.$ac_objext conftest$ac_exeext
1.31 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1.32 + (eval $ac_link) 2>conftest.er1
1.33 + ac_status=$?
1.34 + grep -v '^ *+' conftest.er1 >conftest.err
1.35 + rm -f conftest.er1
1.36 + cat conftest.err >&5
1.37 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.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\"") >&5
1.41 + (eval $ac_try) 2>&5
1.42 + ac_status=$?
1.43 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.44 + (exit $ac_status); }; } &&
1.45 + { ac_try='test -s conftest$ac_exeext'
1.46 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.47 + (eval $ac_try) 2>&5
1.48 + ac_status=$?
1.49 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.50 + (exit $ac_status); }; }; then
1.51 + gt_cv_func_ngettext_libc=yes
1.52 +else
1.53 + echo "$as_me: failed program was:" >&5
1.54 +sed 's/^/| /' conftest.$ac_ext >&5
1.55 +
1.56 +gt_cv_func_ngettext_libc=no
1.57 +fi
1.58 +rm -f conftest.err conftest.$ac_objext \
1.59 + conftest$ac_exeext conftest.$ac_ext
1.60 +
1.61 +fi
1.62 +echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
1.63 +echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6
1.64 +
1.65 + if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1.66 + echo "$as_me:$LINENO: checking for dgettext in libc" >&5
1.67 echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6
1.68 if test "${gt_cv_func_dgettext_libc+set}" = set; then
1.69 echo $ECHO_N "(cached) $ECHO_C" >&6
1.70 @@ -4800,7 +4858,7 @@
1.71 int
1.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 fi
1.81 echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
1.82 echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6
1.83 -
1.84 - if test "$gt_cv_func_dgettext_libc" = "yes" ; then
1.85 + fi
1.86 +
1.87 + if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1.88
1.89 for ac_func in bind_textdomain_codeset
1.90 do
1.91 @@ -4948,6 +5007,7 @@
1.92 # If we don't have everything we want, check in libintl
1.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" ; then
1.97
1.98 echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
1.99 @@ -5014,6 +5074,70 @@
1.100 echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
1.101 echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
1.102 if test $ac_cv_lib_intl_bindtextdomain = yes; then
1.103 + echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
1.104 +echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
1.105 +if test "${ac_cv_lib_intl_ngettext+set}" = set; then
1.106 + echo $ECHO_N "(cached) $ECHO_C" >&6
1.107 +else
1.108 + ac_check_lib_save_LIBS=$LIBS
1.109 +LIBS="-lintl $LIBS"
1.110 +cat >conftest.$ac_ext <<_ACEOF
1.111 +/* confdefs.h. */
1.112 +_ACEOF
1.113 +cat confdefs.h >>conftest.$ac_ext
1.114 +cat >>conftest.$ac_ext <<_ACEOF
1.115 +/* end confdefs.h. */
1.116 +
1.117 +/* Override any gcc2 internal prototype to avoid an error. */
1.118 +#ifdef __cplusplus
1.119 +extern "C"
1.120 +#endif
1.121 +/* We use char because int might match the return type of a gcc2
1.122 + builtin and then its argument prototype would still apply. */
1.123 +char ngettext ();
1.124 +int
1.125 +main ()
1.126 +{
1.127 +ngettext ();
1.128 + ;
1.129 + return 0;
1.130 +}
1.131 +_ACEOF
1.132 +rm -f conftest.$ac_objext conftest$ac_exeext
1.133 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1.134 + (eval $ac_link) 2>conftest.er1
1.135 + ac_status=$?
1.136 + grep -v '^ *+' conftest.er1 >conftest.err
1.137 + rm -f conftest.er1
1.138 + cat conftest.err >&5
1.139 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.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\"") >&5
1.143 + (eval $ac_try) 2>&5
1.144 + ac_status=$?
1.145 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.146 + (exit $ac_status); }; } &&
1.147 + { ac_try='test -s conftest$ac_exeext'
1.148 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.149 + (eval $ac_try) 2>&5
1.150 + ac_status=$?
1.151 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.152 + (exit $ac_status); }; }; then
1.153 + ac_cv_lib_intl_ngettext=yes
1.154 +else
1.155 + echo "$as_me: failed program was:" >&5
1.156 +sed 's/^/| /' conftest.$ac_ext >&5
1.157 +
1.158 +ac_cv_lib_intl_ngettext=no
1.159 +fi
1.160 +rm -f conftest.err conftest.$ac_objext \
1.161 + conftest$ac_exeext conftest.$ac_ext
1.162 +LIBS=$ac_check_lib_save_LIBS
1.163 +fi
1.164 +echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
1.165 +echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
1.166 +if test $ac_cv_lib_intl_ngettext = yes; then
1.167 echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
1.168 echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6
1.169 if test "${ac_cv_lib_intl_dgettext+set}" = set; then
1.170 @@ -5083,13 +5207,79 @@
1.171
1.172 fi
1.173
1.174 +fi
1.175 +
1.176
1.177 if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
1.178 echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
1.179 echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6
1.180 echo "$as_me:$LINENO: result: " >&5
1.181 echo "${ECHO_T}" >&6
1.182 - echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
1.183 + echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
1.184 +echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
1.185 +if test "${ac_cv_lib_intl_ngettext+set}" = set; then
1.186 + echo $ECHO_N "(cached) $ECHO_C" >&6
1.187 +else
1.188 + ac_check_lib_save_LIBS=$LIBS
1.189 +LIBS="-lintl -liconv $LIBS"
1.190 +cat >conftest.$ac_ext <<_ACEOF
1.191 +/* confdefs.h. */
1.192 +_ACEOF
1.193 +cat confdefs.h >>conftest.$ac_ext
1.194 +cat >>conftest.$ac_ext <<_ACEOF
1.195 +/* end confdefs.h. */
1.196 +
1.197 +/* Override any gcc2 internal prototype to avoid an error. */
1.198 +#ifdef __cplusplus
1.199 +extern "C"
1.200 +#endif
1.201 +/* We use char because int might match the return type of a gcc2
1.202 + builtin and then its argument prototype would still apply. */
1.203 +char ngettext ();
1.204 +int
1.205 +main ()
1.206 +{
1.207 +ngettext ();
1.208 + ;
1.209 + return 0;
1.210 +}
1.211 +_ACEOF
1.212 +rm -f conftest.$ac_objext conftest$ac_exeext
1.213 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1.214 + (eval $ac_link) 2>conftest.er1
1.215 + ac_status=$?
1.216 + grep -v '^ *+' conftest.er1 >conftest.err
1.217 + rm -f conftest.er1
1.218 + cat conftest.err >&5
1.219 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.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\"") >&5
1.223 + (eval $ac_try) 2>&5
1.224 + ac_status=$?
1.225 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.226 + (exit $ac_status); }; } &&
1.227 + { ac_try='test -s conftest$ac_exeext'
1.228 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.229 + (eval $ac_try) 2>&5
1.230 + ac_status=$?
1.231 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.232 + (exit $ac_status); }; }; then
1.233 + ac_cv_lib_intl_ngettext=yes
1.234 +else
1.235 + echo "$as_me: failed program was:" >&5
1.236 +sed 's/^/| /' conftest.$ac_ext >&5
1.237 +
1.238 +ac_cv_lib_intl_ngettext=no
1.239 +fi
1.240 +rm -f conftest.err conftest.$ac_objext \
1.241 + conftest$ac_exeext conftest.$ac_ext
1.242 +LIBS=$ac_check_lib_save_LIBS
1.243 +fi
1.244 +echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
1.245 +echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
1.246 +if test $ac_cv_lib_intl_ngettext = yes; then
1.247 + echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
1.248 echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6
1.249 if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
1.250 echo $ECHO_N "(cached) $ECHO_C" >&6
1.251 @@ -5159,12 +5349,16 @@
1.252 :
1.253 fi
1.254
1.255 +else
1.256 + :
1.257 +fi
1.258 +
1.259 fi
1.260
1.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 dgettext
1.265 + # and both have dgettext and ngettext
1.266 #
1.267 if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
1.268 glib_save_LIBS="$LIBS"
1.269 @@ -5276,7 +5470,8 @@
1.270 if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
1.271 gt_cv_func_dgettext_libc=no
1.272 else
1.273 - if test "$gt_cv_func_dgettext_libc" = "yes"; then
1.274 + if test "$gt_cv_func_dgettext_libc" = "yes" \
1.275 + && test "$gt_cv_func_ngettext_libc" = "yes"; then
1.276 gt_cv_func_dgettext_libintl=no
1.277 fi
1.278 fi
.