Module: wine Branch: master Commit: 7cc41589a9dd0677c6fa38949d1d7e416c48fe1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc41589a9dd0677c6fa38949d...
Author: Alexandre Julliard julliard@winehq.org Date: Mon May 15 19:57:51 2017 +0200
configure: Make warning messages consistent.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 12 ++++++------ configure.ac | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/configure b/configure index 68717e9..15f618d 100755 --- a/configure +++ b/configure @@ -11741,7 +11741,7 @@ if test "x$ac_cv_func_gnutls_hash" = xyes; then : _ACEOF
else - as_fn_append wine_notices "|libgnutls ${notice_platform}development files too old, no bcrypt hash support." + as_fn_append wine_notices "|libgnutls ${notice_platform}development files too old, bcrypt hashes won't be supported." fi done
@@ -12872,9 +12872,9 @@ test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ - fi if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ; then : case "x$with_gstreamer" in - x) as_fn_append wine_notices "|gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;; + x) as_fn_append wine_notices "|gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported." ;; xno) ;; - *) as_fn_error $? "gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled + *) as_fn_error $? "gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported. This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; esac
@@ -13930,9 +13930,9 @@ fi fi if test "x$ac_cv_lib_openal" != xyes; then : case "x$with_openal" in - x) as_fn_append wine_notices "|libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported" ;; + x) as_fn_append wine_notices "|libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported." ;; xno) ;; - *) as_fn_error $? "libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported + *) as_fn_error $? "libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported. This is an error since --with-openal was requested." "$LINENO" 5 ;; esac enable_openal32=${enable_openal32:-no} @@ -13971,7 +13971,7 @@ $as_echo "$ac_cv_have_openalsoft" >&6; } fi if test "x$ac_cv_have_openalsoft" != xyes then - as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported." enable_x3daudio1_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} diff --git a/configure.ac b/configure.ac index 74be5f0..2e76d5a 100644 --- a/configure.ac +++ b/configure.ac @@ -1266,7 +1266,7 @@ then #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\(-deb0\)\{0,1\}]]) WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, - [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])])])], + [WINE_NOTICE([libgnutls ${notice_platform}development files too old, bcrypt hashes won't be supported.])])])], [GNUTLS_CFLAGS=""])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], @@ -1481,7 +1481,7 @@ then WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ], - [gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled]) + [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}
dnl **** Check for ALSA 1.x **** @@ -1657,7 +1657,7 @@ then AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])],,) fi WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes], - [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported], + [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.], [enable_openal32])
dnl **** Check for openal-soft **** @@ -1672,7 +1672,7 @@ LPALCRENDERSAMPLESSOFT x;]])],[ac_cv_have_openalsoft=yes],[ac_cv_have_openalsoft fi if test "x$ac_cv_have_openalsoft" != xyes then - WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported.]) enable_x3daudio1_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no}