Author: yoann
Date: 2009-04-22 11:43:18 +0200 (Wed, 22 Apr 2009)
New Revision: 11158
Modified:
libprelude/trunk/libmissing/m4/btowc.m4
libprelude/trunk/libmissing/m4/mbrtowc.m4
libprelude/trunk/libmissing/m4/wcrtomb.m4
libprelude/trunk/libmissing/m4/wctob.m4
Log:
Improved GnuLib fixes, use AC_TRY_RUN support.
Modified: libprelude/trunk/libmissing/m4/btowc.m4
===================================================================
--- libprelude/trunk/libmissing/m4/btowc.m4 2009-04-22 09:43:14 UTC (rev 11157)
+++ libprelude/trunk/libmissing/m4/btowc.m4 2009-04-22 09:43:18 UTC (rev 11158)
@@ -30,7 +30,7 @@
*) gl_cv_func_btowc_eof="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_FR != none && test $cross_compiling = no; then
+ if test $LOCALE_FR != none; then
AC_TRY_RUN([
#include <locale.h>
#include <stdio.h>
@@ -47,7 +47,7 @@
}],
[gl_cv_func_btowc_eof=yes],
[gl_cv_func_btowc_eof=no],
- [])
+ [gl_cv_func_btowc_eof=yes])
fi
])
case "$gl_cv_func_btowc_eof" in
Modified: libprelude/trunk/libmissing/m4/mbrtowc.m4
===================================================================
--- libprelude/trunk/libmissing/m4/mbrtowc.m4 2009-04-22 09:43:14 UTC (rev 11157)
+++ libprelude/trunk/libmissing/m4/mbrtowc.m4 2009-04-22 09:43:18 UTC (rev 11158)
@@ -105,7 +105,7 @@
*) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_JA != none && test $cross_compiling = no; then
+ if test $LOCALE_JA != none; then
AC_TRY_RUN([
#include <locale.h>
#include <string.h>
@@ -127,7 +127,7 @@
}],
[gl_cv_func_mbrtowc_incomplete_state=yes],
[gl_cv_func_mbrtowc_incomplete_state=no],
- [])
+ [gl_cv_func_mbrtowc_incomplete_state=yes])
fi
])
])
@@ -153,7 +153,7 @@
*) gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_ZH_CN != none && test $cross_compiling = no; then
+ if test $LOCALE_ZH_CN != none; then
AC_TRY_RUN([
#include <locale.h>
#include <string.h>
@@ -178,7 +178,7 @@
}],
[gl_cv_func_mbrtowc_sanitycheck=yes],
[gl_cv_func_mbrtowc_sanitycheck=no],
- [])
+ [gl_cv_func_mbrtowc_sanitycheck=yes])
fi
])
])
@@ -204,7 +204,7 @@
*) gl_cv_func_mbrtowc_null_arg="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_FR_UTF8 != none && test $cross_compiling = no; then
+ if test $LOCALE_FR_UTF8 != none; then
AC_TRY_RUN([
#include <locale.h>
#include <string.h>
@@ -225,7 +225,7 @@
return 1;
}
return 0;
-}], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], [])
+}], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], [gl_cv_func_mbrtowc_null_arg=yes])
fi
])
])
@@ -254,7 +254,7 @@
*) gl_cv_func_mbrtowc_retval="guessing yes" ;;
esac
changequote([,])dnl
- if (test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none) && test $cross_compiling = no; then
+ if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
AC_TRY_RUN([
#include <locale.h>
#include <string.h>
@@ -295,7 +295,7 @@
}],
[gl_cv_func_mbrtowc_retval=yes],
[gl_cv_func_mbrtowc_retval=no],
- [])
+ [gl_cv_func_mbrtowc_retval=yes])
fi
])
])
@@ -321,7 +321,7 @@
*) gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_ZH_CN != none && test $cross_compiling = no; then
+ if test $LOCALE_ZH_CN != none; then
AC_TRY_RUN([
#include <locale.h>
#include <string.h>
@@ -342,7 +342,7 @@
}],
[gl_cv_func_mbrtowc_nul_retval=yes],
[gl_cv_func_mbrtowc_nul_retval=no],
- [])
+ [gl_cv_func_mbrtowc_nul_retval=yes])
fi
])
])
Modified: libprelude/trunk/libmissing/m4/wcrtomb.m4
===================================================================
--- libprelude/trunk/libmissing/m4/wcrtomb.m4 2009-04-22 09:43:14 UTC (rev 11157)
+++ libprelude/trunk/libmissing/m4/wcrtomb.m4 2009-04-22 09:43:18 UTC (rev 11158)
@@ -35,7 +35,7 @@
*) gl_cv_func_wcrtomb_retval="guessing yes" ;;
esac
changequote([,])dnl
- if (test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none) && test $cross_compiling = no; then
+ if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
AC_TRY_RUN([
#include <locale.h>
#include <stdio.h>
@@ -67,7 +67,7 @@
}],
[gl_cv_func_wcrtomb_retval=yes],
[gl_cv_func_wcrtomb_retval=no],
- [])
+ [gl_cv_func_wcrtomb_retval=yes])
fi
])
case "$gl_cv_func_wcrtomb_retval" in
Modified: libprelude/trunk/libmissing/m4/wctob.m4
===================================================================
--- libprelude/trunk/libmissing/m4/wctob.m4 2009-04-22 09:43:14 UTC (rev 11157)
+++ libprelude/trunk/libmissing/m4/wctob.m4 2009-04-22 09:43:18 UTC (rev 11158)
@@ -34,7 +34,7 @@
*) gl_cv_func_wctob_works="guessing yes" ;;
esac
changequote([,])dnl
- if test $LOCALE_FR != none && test $cross_compiling = no; then
+ if test $LOCALE_FR != none; then
AC_TRY_RUN([
#include <locale.h>
#include <string.h>
@@ -53,7 +53,7 @@
}],
[gl_cv_func_wctob_works=yes],
[gl_cv_func_wctob_works=no],
- [])
+ [gl_cv_func_wctob_works=yes])
fi
])
case "$gl_cv_func_wctob_works" in
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.