From bb7fe6815723cb1023120a32899c204dd956730e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 15 Jun 2006 16:52:32 +0200 Subject: [PATCH] configure: Ues the standard AC_MSG_WARN to print warnings. --- configure | 57 +++++++++++++++++++++++++++++++++++++-------------------- configure.ac | 41 +++++++++++++++++++++-------------------- 2 files changed, 58 insertions(+), 40 deletions(-) diff --git a/configure b/configure index f91bc8f85ec..7f2ef1e809f 100755 --- a/configure +++ b/configure @@ -22808,42 +22808,55 @@ fi exitcode=0 if test "$have_x" = "no" then - echo - echo "*** Warning: X development files not found. Wine will be built without" - echo "*** X support, which currently does not work, and would probably not be" - echo "*** what you want anyway. You will need to install devel packages of" - echo "*** Xlib/Xfree86 at the very least." + echo >&2 + { echo "$as_me:$LINENO: WARNING: X development files not found. Wine will be built without" >&5 +echo "$as_me: WARNING: X development files not found. Wine will be built without" >&2;} + { echo "$as_me:$LINENO: WARNING: X support, which currently does not work, and probably" >&5 +echo "$as_me: WARNING: X support, which currently does not work, and probably" >&2;} + { echo "$as_me:$LINENO: WARNING: isn't what you want anyway. You will need to install devel" >&5 +echo "$as_me: WARNING: isn't what you want anyway. You will need to install devel" >&2;} + { echo "$as_me:$LINENO: WARNING: packages of Xlib/Xfree86 at the very least." >&5 +echo "$as_me: WARNING: packages of Xlib/Xfree86 at the very least." >&2;} exitcode=1 fi if test "$wine_cv_opengl_version_OK" = "no" then - echo - echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D" - echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." + echo >&2 + { echo "$as_me:$LINENO: WARNING: Old Mesa headers detected. Wine will be built without Direct3D" >&5 +echo "$as_me: WARNING: Old Mesa headers detected. Wine will be built without Direct3D" >&2;} + { echo "$as_me:$LINENO: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&5 +echo "$as_me: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&2;} exitcode=1 fi if test "$wine_cv_msg_freetype" = "yes" then - echo - echo "*** Note: Your system appears to have the FreeType 2 runtime libraries" - echo "*** installed, but 'freetype-config' is not in your PATH. Install the" - echo "*** freetype-devel package (or its equivalent on your distribution) to" - echo "*** enable Wine to use TrueType fonts." + echo >&2 + { echo "$as_me:$LINENO: WARNING: Your system appears to have the FreeType 2 runtime libraries" >&5 +echo "$as_me: WARNING: Your system appears to have the FreeType 2 runtime libraries" >&2;} + { echo "$as_me:$LINENO: WARNING: installed, but 'freetype-config' is not in your PATH. Install" >&5 +echo "$as_me: WARNING: installed, but 'freetype-config' is not in your PATH. Install" >&2;} + { echo "$as_me:$LINENO: WARNING: the freetype-devel package (or its equivalent on your distribution)" >&5 +echo "$as_me: WARNING: the freetype-devel package (or its equivalent on your distribution)" >&2;} + { echo "$as_me:$LINENO: WARNING: to enable Wine to use TrueType fonts." >&5 +echo "$as_me: WARNING: to enable Wine to use TrueType fonts." >&2;} exitcode=1 fi if test -z "$FONTSSUBDIRS" then - echo + echo >&2 if test "$FONTFORGE" = "false" then - echo "*** Warning: FontForge is missing." + { echo "$as_me:$LINENO: WARNING: FontForge is missing." >&5 +echo "$as_me: WARNING: FontForge is missing." >&2;} else - echo "*** Warning: FreeType is missing." + { echo "$as_me:$LINENO: WARNING: FreeType is missing." >&5 +echo "$as_me: WARNING: FreeType is missing." >&2;} fi - echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." + { echo "$as_me:$LINENO: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned." >&5 +echo "$as_me: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned." >&2;} exitcode=1 fi @@ -22857,9 +22870,13 @@ if test -z "$ALSALIBS" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" then - echo "*** No sound system was found. Windows applications will be silent." - echo "*** The currently supported sound systems are:" - echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" + echo >&2 + { echo "$as_me:$LINENO: WARNING: No sound system was found. Windows applications will be silent." >&5 +echo "$as_me: WARNING: No sound system was found. Windows applications will be silent." >&2;} + { echo "$as_me:$LINENO: WARNING: The currently supported sound systems are:" >&5 +echo "$as_me: WARNING: The currently supported sound systems are:" >&2;} + { echo "$as_me:$LINENO: WARNING: ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" >&5 +echo "$as_me: WARNING: ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" >&2;} exitcode=1 fi diff --git a/configure.ac b/configure.ac index 5b83b7ca3da..d6295b10601 100644 --- a/configure.ac +++ b/configure.ac @@ -1826,42 +1826,42 @@ AC_OUTPUT exitcode=0 if test "$have_x" = "no" then - echo - echo "*** Warning: X development files not found. Wine will be built without" - echo "*** X support, which currently does not work, and would probably not be" - echo "*** what you want anyway. You will need to install devel packages of" - echo "*** Xlib/Xfree86 at the very least." + echo >&2 + AC_MSG_WARN([X development files not found. Wine will be built without]) + AC_MSG_WARN([X support, which currently does not work, and probably]) + AC_MSG_WARN([isn't what you want anyway. You will need to install devel]) + AC_MSG_WARN([ packages of Xlib/Xfree86 at the very least.]) exitcode=1 fi if test "$wine_cv_opengl_version_OK" = "no" then - echo - echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D" - echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." + echo >&2 + AC_MSG_WARN([Old Mesa headers detected. Wine will be built without Direct3D]) + AC_MSG_WARN([support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).]) exitcode=1 fi if test "$wine_cv_msg_freetype" = "yes" then - echo - echo "*** Note: Your system appears to have the FreeType 2 runtime libraries" - echo "*** installed, but 'freetype-config' is not in your PATH. Install the" - echo "*** freetype-devel package (or its equivalent on your distribution) to" - echo "*** enable Wine to use TrueType fonts." + echo >&2 + AC_MSG_WARN([Your system appears to have the FreeType 2 runtime libraries]) + AC_MSG_WARN([installed, but 'freetype-config' is not in your PATH. Install]) + AC_MSG_WARN([the freetype-devel package (or its equivalent on your distribution)]) + AC_MSG_WARN([to enable Wine to use TrueType fonts.]) exitcode=1 fi if test -z "$FONTSSUBDIRS" then - echo + echo >&2 if test "$FONTFORGE" = "false" then - echo "*** Warning: FontForge is missing." + AC_MSG_WARN([FontForge is missing.]) else - echo "*** Warning: FreeType is missing." + AC_MSG_WARN([FreeType is missing.]) fi - echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." + AC_MSG_WARN([Fonts will not be built. Dialog text may be invisible or unaligned.]) exitcode=1 fi @@ -1875,9 +1875,10 @@ if test -z "$ALSALIBS" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" then - echo "*** No sound system was found. Windows applications will be silent." - echo "*** The currently supported sound systems are:" - echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" + echo >&2 + AC_MSG_WARN([No sound system was found. Windows applications will be silent.]) + AC_MSG_WARN([The currently supported sound systems are:]) + AC_MSG_WARN([ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS]) exitcode=1 fi -- 2.11.4.GIT