configure: Exit with a non-zero exit code if a core dependency is missing.

This commit is contained in:
Mike McCormack 2006-04-17 18:16:10 +09:00 committed by Alexandre Julliard
parent 6d9af55a12
commit 8d6b9aa63a
2 changed files with 22 additions and 6 deletions

14
configure vendored
View File

@ -21011,6 +21011,7 @@ if test "$no_create" != yes; then
fi fi
exitcode=0
if test "$have_x" = "no" if test "$have_x" = "no"
then then
echo echo
@ -21018,6 +21019,7 @@ then
echo "*** X support, which currently does not work, and would probably not be" 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 "*** what you want anyway. You will need to install devel packages of"
echo "*** Xlib/Xfree86 at the very least." echo "*** Xlib/Xfree86 at the very least."
exitcode=1
fi fi
if test "$wine_cv_opengl_version_OK" = "no" if test "$wine_cv_opengl_version_OK" = "no"
@ -21025,6 +21027,7 @@ then
echo echo
echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D" echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D"
echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)."
exitcode=1
fi fi
if test "$wine_cv_msg_freetype" = "yes" if test "$wine_cv_msg_freetype" = "yes"
@ -21034,6 +21037,7 @@ then
echo "*** installed, but 'freetype-config' is not in your PATH. Install the" echo "*** installed, but 'freetype-config' is not in your PATH. Install the"
echo "*** freetype-devel package (or its equivalent on your distribution) to" echo "*** freetype-devel package (or its equivalent on your distribution) to"
echo "*** enable Wine to use TrueType fonts." echo "*** enable Wine to use TrueType fonts."
exitcode=1
fi fi
if test "$wine_cv_msg_fonts" = "yes" if test "$wine_cv_msg_fonts" = "yes"
@ -21041,6 +21045,7 @@ then
echo echo
echo "*** Warning: Freetype or Fontforge is missing." echo "*** Warning: Freetype or Fontforge is missing."
echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." echo "*** Fonts will not be built. Dialog text may be invisible or unaligned."
exitcode=1
fi fi
if test -z "$ALSALIBS" -a \ if test -z "$ALSALIBS" -a \
@ -21053,12 +21058,15 @@ if test -z "$ALSALIBS" -a \
"$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \
"$ac_cv_header_soundcard_h" != "yes" "$ac_cv_header_soundcard_h" != "yes"
then then
echo "*** No sound system was found. Windows applications will be silent." echo "*** No sound system was found. Windows applications will be silent."
echo "*** The currently supported sound systems are:" echo "*** The currently supported sound systems are:"
echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS"
exitcode=1
fi fi
echo echo
echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine." echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine."
echo echo
exit $exitcode

View File

@ -1746,6 +1746,7 @@ tools/wrc/Makefile])
AC_OUTPUT AC_OUTPUT
exitcode=0
if test "$have_x" = "no" if test "$have_x" = "no"
then then
echo echo
@ -1753,6 +1754,7 @@ then
echo "*** X support, which currently does not work, and would probably not be" 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 "*** what you want anyway. You will need to install devel packages of"
echo "*** Xlib/Xfree86 at the very least." echo "*** Xlib/Xfree86 at the very least."
exitcode=1
fi fi
if test "$wine_cv_opengl_version_OK" = "no" if test "$wine_cv_opengl_version_OK" = "no"
@ -1760,6 +1762,7 @@ then
echo echo
echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D" echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D"
echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)."
exitcode=1
fi fi
if test "$wine_cv_msg_freetype" = "yes" if test "$wine_cv_msg_freetype" = "yes"
@ -1769,6 +1772,7 @@ then
echo "*** installed, but 'freetype-config' is not in your PATH. Install the" echo "*** installed, but 'freetype-config' is not in your PATH. Install the"
echo "*** freetype-devel package (or its equivalent on your distribution) to" echo "*** freetype-devel package (or its equivalent on your distribution) to"
echo "*** enable Wine to use TrueType fonts." echo "*** enable Wine to use TrueType fonts."
exitcode=1
fi fi
if test "$wine_cv_msg_fonts" = "yes" if test "$wine_cv_msg_fonts" = "yes"
@ -1776,6 +1780,7 @@ then
echo echo
echo "*** Warning: Freetype or Fontforge is missing." echo "*** Warning: Freetype or Fontforge is missing."
echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." echo "*** Fonts will not be built. Dialog text may be invisible or unaligned."
exitcode=1
fi fi
if test -z "$ALSALIBS" -a \ if test -z "$ALSALIBS" -a \
@ -1788,15 +1793,18 @@ if test -z "$ALSALIBS" -a \
"$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \
"$ac_cv_header_soundcard_h" != "yes" "$ac_cv_header_soundcard_h" != "yes"
then then
echo "*** No sound system was found. Windows applications will be silent." echo "*** No sound system was found. Windows applications will be silent."
echo "*** The currently supported sound systems are:" echo "*** The currently supported sound systems are:"
echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS"
exitcode=1
fi fi
echo echo
echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine." echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine."
echo echo
exit $exitcode
dnl Local Variables: dnl Local Variables:
dnl comment-start: "dnl " dnl comment-start: "dnl "
dnl comment-end: "" dnl comment-end: ""