Module: wine Branch: master Commit: 88155ca8c8596a0570e2ccec5bb9eaaf1a32982d URL: http://source.winehq.org/git/wine.git/?a=commit;h=88155ca8c8596a0570e2ccec5b...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Jan 8 15:53:26 2011 +0100
configure: Update libgettextpo check to detect too old versions.
---
configure | 24 ++++++++++++------------ configure.ac | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/configure b/configure index 60d5d49..9892e45 100755 --- a/configure +++ b/configure @@ -10591,9 +10591,9 @@ if test "x$enable_tools" != xno then if test "$ac_cv_header_gettext_po_h" = "yes" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for po_file_write in -lgettextpo" >&5 -$as_echo_n "checking for po_file_write in -lgettextpo... " >&6; } -if test "${ac_cv_lib_gettextpo_po_file_write+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for po_message_msgctxt in -lgettextpo" >&5 +$as_echo_n "checking for po_message_msgctxt in -lgettextpo... " >&6; } +if test "${ac_cv_lib_gettextpo_po_message_msgctxt+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10607,27 +10607,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char po_file_write (); +char po_message_msgctxt (); int main () { -return po_file_write (); +return po_message_msgctxt (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gettextpo_po_file_write=yes + ac_cv_lib_gettextpo_po_message_msgctxt=yes else - ac_cv_lib_gettextpo_po_file_write=no + ac_cv_lib_gettextpo_po_message_msgctxt=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gettextpo_po_file_write" >&5 -$as_echo "$ac_cv_lib_gettextpo_po_file_write" >&6; } -if test "x$ac_cv_lib_gettextpo_po_file_write" = x""yes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gettextpo_po_message_msgctxt" >&5 +$as_echo "$ac_cv_lib_gettextpo_po_message_msgctxt" >&6; } +if test "x$ac_cv_lib_gettextpo_po_message_msgctxt" = x""yes; then :
$as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h
@@ -10638,9 +10638,9 @@ fi fi if test "x$LIBGETTEXTPO" = "x"; then : case "x$with_gettextpo" in - x) as_fn_append wine_warnings "|GetText ${notice_platform}development files not found. Internationalization won't be fully supported." ;; + x) as_fn_append wine_warnings "|GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported." ;; xno) ;; - *) as_fn_error $? "GetText ${notice_platform}development files not found. Internationalization won't be fully supported. + *) as_fn_error $? "GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported. This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 9865974..caa4303 100644 --- a/configure.ac +++ b/configure.ac @@ -1414,11 +1414,11 @@ if test "x$enable_tools" != xno then if test "$ac_cv_header_gettext_po_h" = "yes" then - AC_CHECK_LIB(gettextpo,po_file_write, + AC_CHECK_LIB(gettextpo,po_message_msgctxt, [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).]) AC_SUBST(LIBGETTEXTPO,"-lgettextpo")]) fi - WINE_WARNING_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],[GetText ${notice_platform}development files not found. Internationalization won't be fully supported.]) + WINE_WARNING_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],[GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported.]) fi
dnl **** Check for EsounD ****