makefiles: Use AS_VAR_APPEND to build the list of warning messages.
This commit is contained in:
Alexandre Julliard
parent
e85bf5c190
commit
0dc503bcf1
|
|
@ -272,8 +272,8 @@ dnl Usage: WINE_WARNING(warning)
|
|||
dnl Usage: WINE_WARNING_WITH(with_flag, test, warning)
|
||||
dnl Usage: WINE_PRINT_MESSAGES
|
||||
dnl
|
||||
AC_DEFUN([WINE_NOTICE],[wine_notices="$wine_notices|$1"])
|
||||
AC_DEFUN([WINE_WARNING],[wine_warnings="$wine_warnings|$1"])
|
||||
AC_DEFUN([WINE_NOTICE],[AS_VAR_APPEND([wine_notices],["|$1"])])
|
||||
AC_DEFUN([WINE_WARNING],[AS_VAR_APPEND([wine_warnings],["|$1"])])
|
||||
|
||||
AC_DEFUN([WINE_NOTICE_WITH],[AS_IF([$2],[case "x$with_$1" in
|
||||
x) WINE_NOTICE([$3]) ;;
|
||||
|
|
|
|||
|
|
@ -5068,9 +5068,9 @@ test -n "$ICOTOOL" || ICOTOOL="false"
|
|||
|
||||
if test "${enable_maintainer_mode+set}" = set
|
||||
then
|
||||
if test "$FONTFORGE" = "false"; then wine_warnings="$wine_warnings|fontforge is missing, fonts can't be rebuilt."; fi
|
||||
if test "$RSVG" = "false"; then wine_warnings="$wine_warnings|rsvg is missing, icons can't be rebuilt."; fi
|
||||
if test "$ICOTOOL" = "false"; then wine_warnings="$wine_warnings|icotool is missing, icons can't be rebuilt."; fi
|
||||
if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi
|
||||
if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi
|
||||
if test "$ICOTOOL" = "false"; then as_fn_append wine_warnings "|icotool is missing, icons can't be rebuilt."; fi
|
||||
fi
|
||||
|
||||
case $host_cpu in
|
||||
|
|
@ -7936,7 +7936,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_Xcursor" = "x"; then :
|
||||
case "x$with_xcursor" in
|
||||
x) wine_notices="$wine_notices|libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported.
|
||||
This is an error since --with-xcursor was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -7998,7 +7998,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_Xi" = "x"; then :
|
||||
case "x$with_xinput" in
|
||||
x) wine_notices="$wine_notices|libxi ${notice_platform}development files not found, the Xinput extension won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libxi ${notice_platform}development files not found, the Xinput extension won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libxi ${notice_platform}development files not found, the Xinput extension won't be supported.
|
||||
This is an error since --with-xinput was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -8052,7 +8052,7 @@ fi
|
|||
fi
|
||||
if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then :
|
||||
case "x$with_xshm" in
|
||||
x) wine_notices="$wine_notices|XShm ${notice_platform}development files not found, X Shared Memory won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|XShm ${notice_platform}development files not found, X Shared Memory won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "XShm ${notice_platform}development files not found, X Shared Memory won't be supported.
|
||||
This is an error since --with-xshm was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -8106,7 +8106,7 @@ fi
|
|||
fi
|
||||
if test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"; then :
|
||||
case "x$with_xshape" in
|
||||
x) wine_notices="$wine_notices|XShape ${notice_platform}development files not found, XShape won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|XShape ${notice_platform}development files not found, XShape won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "XShape ${notice_platform}development files not found, XShape won't be supported.
|
||||
This is an error since --with-xshape was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -8168,7 +8168,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_Xxf86vm" = "x"; then :
|
||||
case "x$with_xxf86vm" in
|
||||
x) wine_notices="$wine_notices|libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.
|
||||
This is an error since --with-xxf86vm was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -8272,7 +8272,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_Xrender" = "x"; then :
|
||||
case "x$with_xrender" in
|
||||
x) wine_warnings="$wine_warnings|libxrender ${notice_platform}development files not found, XRender won't be supported." ;;
|
||||
x) as_fn_append wine_warnings "|libxrender ${notice_platform}development files not found, XRender won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libxrender ${notice_platform}development files not found, XRender won't be supported.
|
||||
This is an error since --with-xrender was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -8349,7 +8349,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_Xrandr" = "x"; then :
|
||||
case "x$with_xrandr" in
|
||||
x) wine_notices="$wine_notices|libxrandr ${notice_platform}development files not found, XRandr won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libxrandr ${notice_platform}development files not found, XRandr won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libxrandr ${notice_platform}development files not found, XRandr won't be supported.
|
||||
This is an error since --with-xrandr was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -8426,7 +8426,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_Xinerama" = "x"; then :
|
||||
case "x$with_xinerama" in
|
||||
x) wine_notices="$wine_notices|libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.
|
||||
This is an error since --with-xinerama was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -8488,7 +8488,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_Xcomposite" = "x"; then :
|
||||
case "x$with_xcomposite" in
|
||||
x) wine_notices="$wine_notices|libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.
|
||||
This is an error since --with-xcomposite was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -8726,7 +8726,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_GLU" = "x"; then :
|
||||
case "x$with_glu" in
|
||||
x) wine_notices="$wine_notices|libGLU ${notice_platform}development files not found, GLU won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libGLU ${notice_platform}development files not found, GLU won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libGLU ${notice_platform}development files not found, GLU won't be supported.
|
||||
This is an error since --with-glu was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -8746,7 +8746,7 @@ fi
|
|||
fi
|
||||
if test -n "$opengl_msg"; then :
|
||||
case "x$with_opengl" in
|
||||
x) wine_warnings="$wine_warnings|$opengl_msg
|
||||
x) as_fn_append wine_warnings "|$opengl_msg
|
||||
OpenGL and Direct3D won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "$opengl_msg
|
||||
|
|
@ -9049,7 +9049,7 @@ done
|
|||
fi
|
||||
if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then :
|
||||
case "x$with_xml" in
|
||||
x) wine_warnings="$wine_warnings|libxml2 ${notice_platform}development files not found, XML won't be supported." ;;
|
||||
x) as_fn_append wine_warnings "|libxml2 ${notice_platform}development files not found, XML won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libxml2 ${notice_platform}development files not found, XML won't be supported.
|
||||
This is an error since --with-xml was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -9142,7 +9142,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_xslt" = "x"; then :
|
||||
case "x$with_xslt" in
|
||||
x) wine_warnings="$wine_warnings|libxslt ${notice_platform}development files not found, xslt won't be supported." ;;
|
||||
x) as_fn_append wine_warnings "|libxslt ${notice_platform}development files not found, xslt won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libxslt ${notice_platform}development files not found, xslt won't be supported.
|
||||
This is an error since --with-xslt was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -9270,7 +9270,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_hal" = "x"; then :
|
||||
case "x$with_hal" in
|
||||
x) wine_notices="$wine_notices|libhal/libdbus ${notice_platform}development files not found, no dynamic device support." ;;
|
||||
x) as_fn_append wine_notices "|libhal/libdbus ${notice_platform}development files not found, no dynamic device support." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libhal/libdbus ${notice_platform}development files not found, no dynamic device support.
|
||||
This is an error since --with-hal was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -9360,7 +9360,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_gnutls" = "x"; then :
|
||||
case "x$with_gnutls" in
|
||||
x) wine_notices="$wine_notices|libgnutls ${notice_platform}development files not found, no schannel support." ;;
|
||||
x) as_fn_append wine_notices "|libgnutls ${notice_platform}development files not found, no schannel support." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libgnutls ${notice_platform}development files not found, no schannel support.
|
||||
This is an error since --with-gnutls was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -9489,7 +9489,7 @@ done
|
|||
LIBS="$ac_save_LIBS"
|
||||
if test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"; then :
|
||||
case "x$with_curses" in
|
||||
x) wine_notices="$wine_notices|lib(n)curses ${notice_platform}development files not found, curses won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|lib(n)curses ${notice_platform}development files not found, curses won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "lib(n)curses ${notice_platform}development files not found, curses won't be supported.
|
||||
This is an error since --with-curses was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -9603,7 +9603,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_sane" = "x"; then :
|
||||
case "x$with_sane" in
|
||||
x) wine_notices="$wine_notices|libsane ${notice_platform}development files not found, scanners won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libsane ${notice_platform}development files not found, scanners won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libsane ${notice_platform}development files not found, scanners won't be supported.
|
||||
This is an error since --with-sane was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -9665,7 +9665,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_v4l1" = "x"; then :
|
||||
case "x$with_v4l" in
|
||||
x) wine_notices="$wine_notices|libv4l ${notice_platform}development files not found." ;;
|
||||
x) as_fn_append wine_notices "|libv4l ${notice_platform}development files not found." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libv4l ${notice_platform}development files not found.
|
||||
This is an error since --with-v4l was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -9820,7 +9820,7 @@ fi
|
|||
fi
|
||||
if test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"; then :
|
||||
case "x$with_gphoto" in
|
||||
x) wine_notices="$wine_notices|libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported.
|
||||
This is an error since --with-gphoto was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -9909,7 +9909,7 @@ fi
|
|||
fi
|
||||
if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"; then :
|
||||
case "x$with_cms" in
|
||||
x) wine_notices="$wine_notices|liblcms ${notice_platform}development files not found, Color Management won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|liblcms ${notice_platform}development files not found, Color Management won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "liblcms ${notice_platform}development files not found, Color Management won't be supported.
|
||||
This is an error since --with-cms was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -10494,7 +10494,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_capi20" = "x"; then :
|
||||
case "x$with_capi" in
|
||||
x) wine_notices="$wine_notices|libcapi20 ${notice_platform}development files not found, ISDN won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libcapi20 ${notice_platform}development files not found, ISDN won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libcapi20 ${notice_platform}development files not found, ISDN won't be supported.
|
||||
This is an error since --with-capi was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -10574,7 +10574,7 @@ done
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_cups" = "x"; then :
|
||||
case "x$with_cups" in
|
||||
x) wine_notices="$wine_notices|libcups ${notice_platform}development files not found, CUPS won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libcups ${notice_platform}development files not found, CUPS won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libcups ${notice_platform}development files not found, CUPS won't be supported.
|
||||
This is an error since --with-cups was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -10763,7 +10763,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_fontconfig" = "x"; then :
|
||||
case "x$with_fontconfig" in
|
||||
x) wine_notices="$wine_notices|fontconfig ${notice_platform}development files not found, fontconfig won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|fontconfig ${notice_platform}development files not found, fontconfig won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "fontconfig ${notice_platform}development files not found, fontconfig won't be supported.
|
||||
This is an error since --with-fontconfig was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -10875,7 +10875,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"; then :
|
||||
case "x$with_openssl" in
|
||||
x) wine_warnings="$wine_warnings|OpenSSL ${notice_platform}development files not found, SSL won't be supported." ;;
|
||||
x) as_fn_append wine_warnings "|OpenSSL ${notice_platform}development files not found, SSL won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "OpenSSL ${notice_platform}development files not found, SSL won't be supported.
|
||||
This is an error since --with-openssl was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -10937,7 +10937,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_gsm" = "x"; then :
|
||||
case "x$with_gsm" in
|
||||
x) wine_notices="$wine_notices|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.
|
||||
This is an error since --with-gsm was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -10999,7 +10999,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_jpeg" = "x"; then :
|
||||
case "x$with_jpeg" in
|
||||
x) wine_warnings="$wine_warnings|libjpeg ${notice_platform}development files not found, JPEG won't be supported." ;;
|
||||
x) as_fn_append wine_warnings "|libjpeg ${notice_platform}development files not found, JPEG won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libjpeg ${notice_platform}development files not found, JPEG won't be supported.
|
||||
This is an error since --with-jpeg was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -11134,7 +11134,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_soname_png" = "x"; then :
|
||||
case "x$with_png" in
|
||||
x) wine_warnings="$wine_warnings|libpng ${notice_platform}development files not found, PNG won't be supported." ;;
|
||||
x) as_fn_append wine_warnings "|libpng ${notice_platform}development files not found, PNG won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libpng ${notice_platform}development files not found, PNG won't be supported.
|
||||
This is an error since --with-png was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -11187,7 +11187,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes; then :
|
||||
case "x$with_mpg123" in
|
||||
x) wine_notices="$wine_notices|libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.
|
||||
This is an error since --with-mpg123 was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -11241,7 +11241,7 @@ fi
|
|||
fi
|
||||
if test "x$ac_cv_lib_openal_alGetSource3i" != xyes; then :
|
||||
case "x$with_openal" in
|
||||
x) wine_notices="$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.
|
||||
This is an error since --with-openal was requested." "$LINENO" 5 ;;
|
||||
|
|
@ -11357,7 +11357,7 @@ if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack"
|
|||
"$ac_cv_header_soundcard_h" != "yes" -a \
|
||||
"x$with_alsa$with_audioio$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnonononononono
|
||||
then
|
||||
wine_warnings="$wine_warnings|No sound system was found. Windows applications will be silent."
|
||||
as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -12498,7 +12498,7 @@ LIBS="$ac_wine_check_funcs_save_LIBS"
|
|||
fi
|
||||
if test "x$LDAPLIBS" = "x"; then :
|
||||
case "x$with_ldap" in
|
||||
x) wine_notices="$wine_notices|libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported." ;;
|
||||
x) as_fn_append wine_notices "|libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error "libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.
|
||||
This is an error since --with-ldap was requested." "$LINENO" 5 ;;
|
||||
|
|
|
|||
Loading…
Reference in New Issue